From c08110c00c0e07e0e399b1fa61d5725f6808031a Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 24 Jul 2012 06:33:56 +0000 Subject: [PATCH] conflict-- SVN revision: 74344 --- legacy/evas/ChangeLog | 1 - 1 file changed, 1 deletion(-) 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)