CONFLICT (modify/delete): data/mp/stats/research/multiplayer/prresearch.txt deleted in HEAD and modified in bugfixes. Version bugfixes of data/mp/stats/research/multiplayer/prresearch.txt left in tree. Automatic merge failed; fix conflicts and then commit the result.
------------------------------------------------------------------------------ Shape the Mobile Experience: Free Subscription Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now. http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk _______________________________________________ Warzone2100-project mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/warzone2100-project
