Auto-merging src/research.cpp Auto-merging src/intdisplay.cpp CONFLICT (content): Merge conflict in src/intdisplay.cpp Auto-merging src/hci.h Auto-merging src/hci.cpp CONFLICT (content): Merge conflict in src/hci.cpp Auto-merging configure.ac Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
