You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/23 00:09:17 UTC
svn propchange: r1641069 - svn:log
Author: jleroux
Revision: 1641069
Modified property: svn:log
Modified: svn:log at Sat Nov 22 23:09:17 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Nov 22 23:09:17 2014
@@ -1,4 +1,4 @@
-"Applied fix from trunk for revision: 1641066" Conflicts handled by hand, I tolerated 2 neutral FTL ?exist to ?? changes.
+"Applied fix from trunk for revision: 1641066" - Conflicts handled by hand. Just formatting and I tolerated the 2 neutral changes from ?exists to ?? done by the automatic merge.
------------------------------------------------------------------------
r1641066 | jleroux | 2014-11-22 15:15:54 +0100 (sam. 22 nov. 2014) | 8 lignes
@@ -11,3 +11,5 @@ For November all days after the 12th dis
jleroux: I simply removed the line added in the block which remove the dot and 000 ms in date/time string. I did not see any reason why this was needed. I modified the comment on this block for faster understanding.
------------------------------------------------------------------------
+
+Damned, I was just I wrote that (comment about conflict handling) somewhere, but lost it. Here it is finally!