From 1a1f332ddacc446931eb6f7e0b3a5129f3a1335d Mon Sep 17 00:00:00 2001
From: Julien Fortin <julien@cumulusnetworks.com>
Date: Wed, 5 Oct 2016 20:13:28 +0200
Subject: [PATCH] docs: examples: fixing merge errors

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---
 docs/examples/interfaces_bridge_igmp_mstp     |  8 --------
 .../vlan_aware_bridges/interfaces.with_bonds  | 16 ++-------------
 .../vlan_aware_bridges/interfaces.with_clag   | 20 ++-----------------
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/docs/examples/interfaces_bridge_igmp_mstp b/docs/examples/interfaces_bridge_igmp_mstp
index 4c2fb20..279f21b 100644
--- a/docs/examples/interfaces_bridge_igmp_mstp
+++ b/docs/examples/interfaces_bridge_igmp_mstp
@@ -31,19 +31,11 @@ iface br-300 inet static
            mstpctl-hello 2
            mstpctl-portnetwork swp13.300=no
            bridge-mclmc 3
-<<<<<<< HEAD
-           bridge-mcrouter 0
-           bridge-mcsnoop  1
-           bridge-mcsqc    3
-           bridge-mcqifaddr 1
-           bridge-mcquerier 1
-=======
            bridge-mcrouter no
            bridge-mcsnoop  yes
            bridge-mcsqc    3
            bridge-mcqifaddr yes
            bridge-mcquerier yes
->>>>>>> cumulus/dev
            bridge-hashel 3
            bridge-hashmax 4
            bridge-mclmi 3
diff --git a/docs/examples/vlan_aware_bridges/interfaces.with_bonds b/docs/examples/vlan_aware_bridges/interfaces.with_bonds
index dfd4b63..692a1e6 100644
--- a/docs/examples/vlan_aware_bridges/interfaces.with_bonds
+++ b/docs/examples/vlan_aware_bridges/interfaces.with_bonds
@@ -4,13 +4,13 @@
 # uplink1, peerlink and downlink are bond interfaces.
 # 'bridge' is a vlan aware bridge with ports uplink1, peerlink
 # and downlink (swp2-20).
-# 
+#
 # native vlan is by default 1
 #
 # 'bridge-vids' attribute is used to declare vlans.
 # 'bridge-pvid' attribute is used to specify native vlans if other than 1
 # 'bridge-access' attribute is used to declare access port
-# 
+#
 auto lo
 iface lo
 
@@ -23,11 +23,7 @@ iface uplink1
     bond-slaves swp32
     bond-mode 802.3ad
     bond-miimon 100
-<<<<<<< HEAD
-    bond-use-carrier 1
-=======
     bond-use-carrier yes
->>>>>>> cumulus/dev
     bond-lacp-rate 1
     bond-min-links 1
     bond-xmit-hash-policy layer2
@@ -39,11 +35,7 @@ iface peerlink
     bond-slaves swp30 swp31
     bond-mode 802.3ad
     bond-miimon 100
-<<<<<<< HEAD
-    bond-use-carrier 1
-=======
     bond-use-carrier yes
->>>>>>> cumulus/dev
     bond-lacp-rate 1
     bond-min-links 1
     bond-xmit-hash-policy layer3+4
@@ -55,11 +47,7 @@ iface downlink
     bond-slaves swp1
     bond-mode 802.3ad
     bond-miimon 100
-<<<<<<< HEAD
-    bond-use-carrier 1
-=======
     bond-use-carrier yes
->>>>>>> cumulus/dev
     bond-lacp-rate 1
     bond-min-links 1
     bond-xmit-hash-policy layer3+4
diff --git a/docs/examples/vlan_aware_bridges/interfaces.with_clag b/docs/examples/vlan_aware_bridges/interfaces.with_clag
index fabc245..42cfd28 100644
--- a/docs/examples/vlan_aware_bridges/interfaces.with_clag
+++ b/docs/examples/vlan_aware_bridges/interfaces.with_clag
@@ -7,13 +7,13 @@
 #
 # All ports inherit 'vlans 10 20-23' from the 'bridge-vids' attribute
 # under the bridge
-# 
+#
 # native vlan is by default 1
 #
 # 'bridge-vids' attribute is used to declare vlans.
 # 'bridge-pvid' attribute is used to specify native vlans if other than 1
 # 'bridge-access' attribute is used to declare access port
-# 
+#
 # 'spine-bond host-bond-0[1-2]' are clag bonds and will be considered by
 # clagd for dual connection. clag-id has to be a non-zero and has to match
 # across the peer switches for the bonds to become dual connected.
@@ -25,11 +25,7 @@ iface spine-bond
       bond-slaves glob swp19-22
       bond-mode 802.3ad
       bond-miimon 100
-<<<<<<< HEAD
-      bond-use-carrier 1
-=======
       bond-use-carrier yes
->>>>>>> cumulus/dev
       bond-lacp-rate 1
       bond-min-links 1
       bond-xmit-hash-policy layer3+4
@@ -42,11 +38,7 @@ iface peer-bond
       bond-slaves glob swp23-24
       bond-mode 802.3ad
       bond-miimon 100
-<<<<<<< HEAD
-      bond-use-carrier 1
-=======
       bond-use-carrier yes
->>>>>>> cumulus/dev
       bond-lacp-rate 1
       bond-min-links 1
       bond-xmit-hash-policy layer3+4
@@ -69,11 +61,7 @@ iface host-bond-01
       bond-slaves swp1
       bond-mode 802.3ad
       bond-miimon 100
-<<<<<<< HEAD
-      bond-use-carrier 1
-=======
       bond-use-carrier yes
->>>>>>> cumulus/dev
       bond-lacp-rate 1
       bond-min-links 1
       bond-xmit-hash-policy layer3+4
@@ -84,11 +72,7 @@ iface host-bond-02
       bond-slaves swp2
       bond-mode 802.3ad
       bond-miimon 100
-<<<<<<< HEAD
-      bond-use-carrier 1
-=======
       bond-use-carrier yes
->>>>>>> cumulus/dev
       bond-lacp-rate 1
       bond-min-links 1
       bond-xmit-hash-policy layer3+4