diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index e4dda37fcd..3825164ce0 100644
--- a/legacy/evas/ChangeLog
+++ b/legacy/evas/ChangeLog
@@ -908,7 +908,6 @@
 2012-07-24  Ingvaldur Sigurjonsson
 
 	* Fix typoe in docs
-<<<<<<< .mine
 
 2012-07-24  Hermet (ChunEon Park)