pimd: Cleanup the headers.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
2025-04-28 11:50:21 +00:00 · 2017-01-19 10:01:02 -05:00 · 2017-01-19 10:01:02 -05:00 · 83190a40e2
commit 83190a40e2
parent 77b7d90beb
31 changed files with 1 additions and 121 deletions
--- 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
--- 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>
--- 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>
--- 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
--- 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>
--- 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
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>
--- 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
--- 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>