Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index 

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

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.