summaryrefslogtreecommitdiffstats
path: root/pimd/pim_neighbor.h
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-01-19 16:01:02 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-01-19 16:01:02 +0100
commit83190a40e2f44f149693bbbb591f6c28a1f68524 (patch)
treef399ff4a1c008628a21e672df3d1cacdee017979 /pimd/pim_neighbor.h
parentpimd: PIM_MRT is a linux specific piece of code. (diff)
downloadfrr-83190a40e2f44f149693bbbb591f6c28a1f68524.tar.xz
frr-83190a40e2f44f149693bbbb591f6c28a1f68524.zip
pimd: Cleanup the headers.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_neighbor.h')
-rw-r--r--pimd/pim_neighbor.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index 9e419aec1..211eda25c 100644
--- 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