From 83190a40e2f44f149693bbbb591f6c28a1f68524 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 19 Jan 2017 10:01:02 -0500
Subject: pimd: Cleanup the headers.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---
 pimd/pim_tlv.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'pimd/pim_tlv.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
-- 
cgit v1.2.3