From 31b79ae3915035cc4ef3b565e58cf5d09443e88e Mon Sep 17 00:00:00 2001
From: Martin Winter <mwinter@opensourcerouting.org>
Date: Thu, 28 Sep 2017 17:35:24 -0700
Subject: [PATCH] debianpkg: Fix leftover marking from merge

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---
 debianpkg/changelog.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debianpkg/changelog.in b/debianpkg/changelog.in
index 3ebc0cc794..187708351d 100644
--- a/debianpkg/changelog.in
+++ b/debianpkg/changelog.in
@@ -1,5 +1,3 @@
-<<<<<<< HEAD:debianpkg/changelog
-<<<<<<< HEAD
 frr (@VERSION@) RELEASED; urgency=medium
 
   * New Enabled: BGP Shutdown Message
-- 
2.39.5