On 05/17/2011 09:34 PM, Gonzalo Odiard wrote:
I think Pootle did a mess here
configure.ac starts with:
<<<<<<< HEAD
AC_INIT([sugar-base],[0.87.2],[],[sugar-base])
=======
AC_INIT([sugar-base],[0.92.0],[],[sugar-base])
eb7ada51259747e39c064abb1eae9be7c01e71d3
[gonzalo@nautilus sugar-base]$ git blame configure.ac
63e8dcfe (Pootle daemon 2011-05-16 17:16:30 +0200 1)<<<<<<< HEAD
e9493fc0 (Simon Schampijer 2010-01-13 17:02:39 +0100 2)
AC_INIT([sugar-base],[0.87.2],[],[sugar-base])
63e8dcfe (Pootle daemon 2011-05-16 17:16:30 +0200 3) =======
7e99b1a8 (Simon Schampijer 2011-02-23 17:14:18 -0500 4)
AC_INIT([sugar-base],[0.92.0],[],[sugar-base])
63e8dcfe (Pootle daemon 2011-05-16 17:16:30 +0200 5)>>>>>>>
eb7ada51259747e39c064abb1eae9be7c01e71d3
[gonzalo@nautilus sugar-base]$ git show 63e8dcfe
commit 63e8dcfeef3147524508c92d3868d90b05c5f9e3
Merge: 16fadaf eb7ada5
Author: Pootle daemon<poo...@pootle.sugarlabs.org>
Date: Mon May 16 17:16:30 2011 +0200
Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 5 of 5
messages translated (0 fuzzy).
Ah, yes this was a merge, Raffael can you see if you can diagnose what
might have happened?
Regards,
Simon
_______________________________________________
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
