ChangeLog: forgot to remove conflicts marks

1 files changed, 0 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 364e7b3cde..a517247c92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,8 +81,6 @@
 	* perl-cpan/config-tiny: new spell, Config::Tiny - Read/Write .ini style
 	  files with as little code as possible
 
-=======
->>>>>>> 5a90497099149604a18c48c8a7cf8ccaca0344c0:ChangeLog
 2007-04-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* libs/c-ares: new spell, asynchronous DNS resolver library,
 	  can be used by curl, bzflag, aria2, tor and others