From: <cyb...@wz...> - 2012-07-06 06:00:18
|
Auto-merging src/template.cpp Auto-merging src/structure.cpp CONFLICT (content): Merge conflict in src/structure.cpp Auto-merging src/researchdef.h Auto-merging src/multiplay.cpp Auto-merging src/display.cpp Automatic merge failed; fix conflicts and then commit the result. |