projects / platform / upstream / efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a3d66cf)
conflict--
authorCarsten Haitzler <raster@rasterman.com>
Tue, 24 Jul 2012 06:33:56 +0000 (06:33 +0000)
committerCarsten Haitzler <raster@rasterman.com>
Tue, 24 Jul 2012 06:33:56 +0000 (06:33 +0000)
SVN revision: 74344

legacy/evas/ChangeLog patch | blob | history

diff --git a/legacy/evas/ChangeLog b/legacy/evas/ChangeLog
index e4dda37..3825164 100644 (file)
--- 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)
 
Domain: UI Framework / EFL;