projects / framework / uifw / evas.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d3663d3)
conflict--
authorraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 24 Jul 2012 06:33:56 +0000 (06:33 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 24 Jul 2012 06:33:56 +0000 (06:33 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@74344 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

ChangeLog patch | blob | history

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