Merge pull request #3108 from dmbaturin/master

[mirror_frr.git] / pimd / DEBUG

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