summaryrefslogtreecommitdiffstats
path: root/pimd/pim_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'pimd/pim_main.c')
-rw-r--r--pimd/pim_main.c4
1 files changed, 0 insertions, 4 deletions
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>