Auto-merging tools/map/mapload.cpp
CONFLICT (content): Merge conflict in tools/map/mapload.cpp
Auto-merging tests/qtscripttest.cpp
Auto-merging tests/modeltest.c
Auto-merging src/template.cpp
CONFLICT (content): Merge conflict in src/template.cpp
Auto-merging src/structure.h
Auto-merging src/structure.cpp
Auto-merging src/multiint.cpp
CONFLICT (content): Merge conflict in src/multiint.cpp
Auto-merging src/intdisplay.cpp
CONFLICT (content): Merge conflict in src/intdisplay.cpp
Auto-merging src/droid.h
Auto-merging src/droid.cpp
Auto-merging src/display3d.cpp
Auto-merging src/ai.cpp
Auto-merging src/action.cpp
CONFLICT (content): Merge conflict in src/action.cpp
Automatic merge failed; fix conflicts and then commit the result.

------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Warzone2100-project mailing list
Warzone2100-project@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-project

Reply via email to