[rkward/frameworks] debian: Clean left over merge conflict marker

[Thomas Friedrichsmeier]

Git commit 459d16027ff5b0b1dd7f31dc9c36dfc31aae6297 by Thomas Friedrichsmeier.
Committed on 05/07/2016 at 05:52.
Pushed by tfry into branch 'frameworks'.

Clean left over merge conflict marker

M  +0    -1    debian/changelog

http://commits.kde.org/rkward/459d16027ff5b0b1dd7f31dc9c36dfc31aae6297

diff --git a/debian/changelog b/debian/changelog
index c0950d5..1a18fdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 rkward (0.6.9z+0.7.0+devel1-1) UNRELEASED; urgency=low
   * new upstream release
   * TODO merge changelog of older releases and second check history