From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 19 Jan 2017 15:01:02 +0000 (-0500)
Subject: pimd: Cleanup the headers.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=83190a40e2f44f149693bbbb591f6c28a1f68524;p=mirror_frr.git

pimd: Cleanup the headers.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/DEBUG b/pimd/DEBUG
index b87542a4a..a6ad260e8 100644
--- a/pimd/DEBUG
+++ b/pimd/DEBUG
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master
 DEBUG HINTS
 
   - Check the source is issuing multicast packets with TTL high enough
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 385b897bf..d6f372cc4 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 6fc8406bb..85baa4eaf 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h
index f8e722cd0..3a6d3361b 100644
--- a/pimd/pim_hello.h
+++ b/pimd/pim_hello.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_HELLO_H
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 7b2c7e2e9..cc4f4f3dc 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -15,10 +15,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index bd4ebd257..244de598d 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -16,7 +16,7 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-s*/
+ */
 
 #ifndef PIM_IFACE_H
 #define PIM_IFACE_H
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index c1ce52449..bfe632135 100644
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_IFCHANNEL_H
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index a309de690..4a23e4f66 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h
index d9542732b..ba80db069 100644
--- a/pimd/pim_igmp_join.h
+++ b/pimd/pim_igmp_join.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_IGMP_JOIN_H
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 4de3b65ec..f7a6cbd0c 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h
index 893fba60f..3a4a81d97 100644
--- a/pimd/pim_igmpv3.h
+++ b/pimd/pim_igmpv3.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_IGMPV3_H
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index db17c3fae..028f77f53 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_join.h b/pimd/pim_join.h
index 27333243d..1eeeef756 100644
--- a/pimd/pim_join.h
+++ b/pimd/pim_join.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_JOIN_H
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index e7b86a040..0749d60b0 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index e1f20b149..7ea7b1ad8 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index 9e419aec1..211eda25c 100644
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_NEIGHBOR_H
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index 1c0a2f2be..0cebe4735 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h
index 1f7e1e5d4..00c5f9012 100644
--- a/pimd/pim_pim.h
+++ b/pimd/pim_pim.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_PIM_H
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 0a60bba25..bd4d9e485 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h
index 8a3f836fa..7b25608c1 100644
--- a/pimd/pim_signals.h
+++ b/pimd/pim_signals.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_SIGNALS_H
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index e443a92d6..035408333 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h
index 29759c953..54f787e2a 100644
--- a/pimd/pim_ssmpingd.h
+++ b/pimd/pim_ssmpingd.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_SSMPINGD_H
diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index 7f814fcda..83f2a635b 100644
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_str.h b/pimd/pim_str.h
index 3536417a9..97263e6a3 100644
--- a/pimd/pim_str.h
+++ b/pimd/pim_str.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_STR_H
diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c
index 2b2a06d36..5223f60e1 100644
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h
index d176c2647..9c4ebc9f0 100644
--- a/pimd/pim_tlv.h
+++ b/pimd/pim_tlv.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_TLV_H
diff --git a/pimd/pim_util.c b/pimd/pim_util.c
index 6d7a8c190..1125db00a 100644
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_util.h b/pimd/pim_util.h
index fbb7b0196..94635466d 100644
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_UTIL_H
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index ee4fcd315..03ee7e92e 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h
index 37ec07b2b..18a632e01 100644
--- a/pimd/pim_vty.h
+++ b/pimd/pim_vty.h
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #ifndef PIM_VTY_H
diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index 81da867e0..29143f362 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -16,10 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-<<<<<<< HEAD
-  
-=======
->>>>>>> origin/master
 */
 
 #include <zebra.h>