Hello there, 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 http://pastebin.com/zdtYtuir
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. -- Anurag Jain Final yr B.Tech CSE SASTRA University Thanjavur(T.N.)-613402 _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
