Auto-merging src/qtscript.cpp CONFLICT (content): Merge conflict in src/qtscript.cpp Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
