[Libreoffice] [GSOC] Regarding ./g pull -r
anuragjainfzd at gmail.com
Tue May 10 22:59:39 PDT 2011
I've been trying to pull the changes using ./g pull -r and got this
output. Seems there are conflicts in sw module. I guess it is because
of the patch I submitted earlier. Have a look at the output here
And this is the output of git diff in sw module http://pastebin.com/VUUk15gp.
Please help me out with how to resolve these conflicts.
Thanks and regards.
Final yr B.Tech CSE
More information about the LibreOffice