wxString Spring::GetSPScriptTxt( SinglePlayerBattle& battle )
{
  ...

<<<<<<< HEAD:src/spring.cpp
=======

>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp
  for ( unsigned int i = 0; i < battle.GetNumBots(); i++ ) { // TODO fix this when new Spring comes.
<<<<<<< HEAD:src/spring.cpp
    BattleBot* bot;
    if ( starttype == 3) bot = battle.GetBot( i );
    else bot = battle.GetBotByStartPosition( i );
=======
    BattleBot* bot = battle.GetBotByStartPosition( i );
>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp
    ASSERT_LOGIC( bot != 0, _T("bot == 0") );
    s += wxString::Format( _T("\t[TEAM%d]\n\t{\n"), i );
<<<<<<< HEAD:src/spring.cpp
    if ( starttype == 3 ){
      s += wxString::Format( _T("\t\tStartPosX=%d;\n"), bot->posx );
      s += wxString::Format( _T("\t\tStartPosZ=%d;\n"), bot->posy );
    }
=======

>>>>>>> 3b057734670f1d37b9ed7bc911ca2bd14a2555c9:src/spring.cpp

...
  }