diff --git a/python-setuptools-git.changes b/python-setuptools-git.changes
index 1be40ac..a088407 100644
--- a/python-setuptools-git.changes
+++ b/python-setuptools-git.changes
@@ -11,7 +11,6 @@ Mon Nov 19 14:54:59 UTC 2012 - cfarrell@suse.com
   SPDX format (or SUSE version thereof)
 
 -------------------------------------------------------------------
->>>>>>> ./python-setuptools-git/python-setuptools-git.changes.r2
 Tue May  3 22:08:54 UTC 2011 - alexandre@exatati.com.br
 
 - Update to 0.4.2: