From: raster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 24 Jul 2012 06:33:56 +0000 (+0000)
Subject: conflict--
X-Git-Tag: submit/trunk/20120815.174732~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=648485adc54435a84f670ba5f3f0fa59dd1487f6;p=profile%2Fivi%2Fevas.git

conflict--



git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@74344 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

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