diff --git a/build.changes b/build.changes
index 7f126ad..961bf09 100644
--- a/build.changes
+++ b/build.changes
@@ -21,7 +21,6 @@ Thu Dec  5 10:01:44 UTC 2013 - adrian@suse.de
 - fix vc tool regression from "minor fixes"
 
 -------------------------------------------------------------------
->>>>>>> .new
 Wed Dec  4 08:26:56 UTC 2013 - adrian@suse.de
 
 - support for project side configured VM kernels