pimd: Cleanup the headers.

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

diff --git a/pimd/DEBUG b/pimd/DEBUG
index b87542a4a283ef3e47aee6e4987f9c587b21bcd2..a6ad260e82243d18e61f588c739f4d625ef08ca0 100644 (file)
--- 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 385b897bf9f74d276f984a09b53af8d40ec8a100..d6f372cc444b309e6ab27e9fc003d4c88530c1b4 100644 (file)
--- 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 6fc8406bb204198c3db0b5fcde6af34dd0c01c12..85baa4eafe994a76bf2b98f085f8745c96ae2919 100644 (file)
--- 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 f8e722cd04b7b304a62cbd568efb81276eb7aa20..3a6d3361ba3b877de661a33744aa199feed9e88c 100644 (file)
--- 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 7b2c7e2e93e6aab794d391c50f4c1b32f3f0c3da..cc4f4f3dce9f8b2e4ac7fde58d45e7caaf7fe722 100644 (file)
--- 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 bd4ebd257d468224ae5861688971c19ce4bb421c..244de598db7dad12f4270db6d2353c71cc56f555 100644 (file)
--- 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 c1ce52449af435e386baa5d7edd9a9a3fb1c9096..bfe632135cfba29e5cb071c6b6e75698c7f2c697 100644 (file)
--- 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 a309de690bdd2686861ead68a778565c8837b77a..4a23e4f6684bd26cf4bf5d20f905c859e43fb31a 100644 (file)
--- 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 d9542732b815c754d9a0cc81aed6a2a16f0032c5..ba80db0696c801d3ac137faa3071fe78b56217ad 100644 (file)
--- 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 4de3b65ec5f79d2ddba83d0a8f9521102a6e50b5..f7a6cbd0ce2910e5a7b6f367b96089d552b555d6 100644 (file)
--- 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 893fba60f2137272948c26e127ce399ab6d8ba06..3a4a81d97ed9e24e156c8aeff2bbbeaa488f11e8 100644 (file)
--- 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 db17c3faec08440a31e435b8216f9bc55584c8aa..028f77f53214c5684cc74f7a2c79643e9e15a631 100644 (file)
--- 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 27333243db41fe565013ab8a75beab1320407569..1eeeef756fde5dba007a02e25b26a6d37c8c5e48 100644 (file)
--- 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 e7b86a04042f1020866839c4b51afe05a8e5d5f1..0749d60b0553b2aa474a066de34f25fe89b8d7cb 100644 (file)
--- 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 e1f20b14961d05f245f0727552f517e491ded0df..7ea7b1ad82a2836387390eabe02fdd810bf6e222 100644 (file)
--- 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 9e419aec18c85e17df82a3cd99b25fbead0c037a..211eda25c7858b8f28b7f356dc1b39828f4d4a16 100644 (file)
--- 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 1c0a2f2beab32038fb1db634d3d3a3339bac35dc..0cebe473558fe51914b2970de7afd24b10adcb37 100644 (file)
--- 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 1f7e1e5d4f166a29b57dde6ae8fd9b23938af158..00c5f9012e3f4fb68e2021d4cda733369bf7801c 100644 (file)
--- 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 0a60bba2526d5ec68df4ff49946d62272a4ce250..bd4d9e4857a9be9893be0cd736ca7029eb091f59 100644 (file)
--- 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 8a3f836fa3e3b80f84a1419d9044df9dea1dbfa9..7b25608c105ae5ca99596a0c1a88b09158f8c2d2 100644 (file)
--- 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 e443a92d614800c35a283c19cd153dc69573c8c5..035408333218e9c0383dcde21c5823b9c00f1f6e 100644 (file)
--- 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 29759c9531ffeb3ec10daf92c7c7a59c2b28e32b..54f787e2a311445b18311098b4c7f0b31b426da0 100644 (file)
--- 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 7f814fcda89a44814ee339be55db5194311148e7..83f2a635b3d9cb3274f5b7a8c0ed4dc7e973d1e7 100644 (file)
--- 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 3536417a952be69d3f38f62eef8fb827a91aed8f..97263e6a37c724f241f7eecbf7b164e48e6d08b4 100644 (file)
--- 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 2b2a06d3685669e0899ef34f906fba3b0ca38928..5223f60e1b223aa6be5769ce42e1b22e7ca8d05d 100644 (file)
--- 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 d176c264713c111013cef2b7c0117120f22835a1..9c4ebc9f0f86d5468e31d4cf5341096ce6bc43e2 100644 (file)
--- 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 6d7a8c19089033365eb2d51e430570dc80a0a968..1125db00a966d04f3b48411cff03ae6432c01513 100644 (file)
--- 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 fbb7b0196b0460b3a0e1d0f4ca379e8cb5634ce0..94635466d9f99e82cc40fd5c332be2092d54b874 100644 (file)
--- 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 ee4fcd3150a526f936839a96cacb68c09540f03e..03ee7e92ec682056f4dd8823ed3e61786d15b9f0 100644 (file)
--- 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 37ec07b2bff4cad0c075607388ee9e8cb7e7d1c3..18a632e016278daefdb15ec6dd6bc2c84f0e589c 100644 (file)
--- 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 81da867e03f468b1650123720007e5ff9e705e9f..29143f362e08a9728b1938cfbe1be4687c2c5fe7 100644 (file)
--- 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>