[Opengeoscience-developers] Conflicts in merging to Master

[Manas Pawar]

Hello Aashish,

 While merging fix-jslint to the latest Master branch, some of the files are conflicting. I have attached the screenshot. So the merge is not taking place. What do u suggest, Should I do a JsLint on the conflicting files and merge? or do we have some other option?

Regards
Manas Pawar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/opengeoscience-developers/attachments/20130420/d13bf4d2/attachment.html>