]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7fa57d0)
debianpkg: Fix leftover marking from merge
authorMartin Winter <mwinter@opensourcerouting.org>
Fri, 29 Sep 2017 00:35:24 +0000 (17:35 -0700)
committerMartin Winter <mwinter@opensourcerouting.org>
Tue, 10 Oct 2017 14:52:49 +0000 (07:52 -0700)
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
debianpkg/changelog.in patch | blob | history

diff --git a/debianpkg/changelog.in b/debianpkg/changelog.in
index 3ebc0cc794f9388d06841af1581cc7e49340cd2f..187708351d46e595cd1ff7afbb2f269c2b0f308d 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.