[evolvis-commits] r8361: fix merge problem. ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 16:40:39 CET 2011


Author: mirabilos
Date: 2011-02-24 16:40:39 +0100 (Thu, 24 Feb 2011)
New Revision: 8361

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
Log:
fix merge problem.


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-24 15:40:12 UTC (rev 8360)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/ChangeLog	2011-02-24 15:40:39 UTC (rev 8361)
@@ -48,7 +48,6 @@
 	file is uploaded seems to be browser specific (?)... catch
 	more cases.
 
->>>>>>> 1.77
 2003-01-21  Ryan T. Sammartino  <ryants at shaw.ca>
 	    Kenia L. Sammartino  <kenia at shaw.ca>
 



More information about the evolvis-commits mailing list