Cedric BAIL, il 11/05/2013 03:36, ha scritto:
> Sorry I had to revert this patch as it was the result of a wrongly
> merged one and I couldn't really tell what was correct or not. Look at
> the <<<<, ===== and >>>>> in sr.po. This did break Enlightenment build
> from git.
Sorry, I had some errors from git and at the end I've committed the file
git filled with conflicting lines :(
I thought that using "git rebase --abort", as git told me to do, would
restore the local repo to the previous version, but looks like it is not so.
--
Massimo Maiurana GPG keyID #7044D601
La fede e' credere in cio' che sai non essere vero
[Mark Twain]
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
