diff --git a/python-Levenshtein.changes b/python-Levenshtein.changes
index 43760c0..c87ad77 100644
--- a/python-Levenshtein.changes
+++ b/python-Levenshtein.changes
@@ -11,7 +11,6 @@ Tue Jan 31 11:43:49 UTC 2012 - elchevive@opensuse.org
 - change from python-setuptools to python-distribute
 
 -------------------------------------------------------------------
->>>>>>> ./python-Levenshtein.changes.r2
 Thu Jan 26 17:16:00 UTC 2012 - elchevive@opensuse.org
 
 - spec cleaning, remove --record-from-files