diff --git a/tigervnc.changes b/tigervnc.changes
index e333a6d..bb443c1 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -33,7 +33,6 @@ Thu Mar 21 09:16:51 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
   runtime.
 
 -------------------------------------------------------------------
->>>>>>> ./tigervnc.changes.r85a118aa653f1d42c31302a788064076
 Thu Feb  7 12:34:03 UTC 2019 - Stephan Kulow <coolo@suse.com>
 
 - Fix build with latest cmake - which now requires the source