CONFLICT (add/add): Merge conflict in GameInfo/FrigateFloodCarrier.entity
Auto-merging GameInfo/FrigateCovUtility1.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovUtility1.entity
Auto-merging GameInfo/FrigateCovUtility0.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovUtility0.entity
Auto-merging GameInfo/FrigateCovTradeShip.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovTradeShip.entity
Auto-merging GameInfo/FrigateCovStarBaseConstructor.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovStarBaseConstructor.entity
Auto-merging GameInfo/FrigateCovSiege.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovSiege.entity
Auto-merging GameInfo/FrigateCovScout.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovScout.entity
Auto-merging GameInfo/FrigateCovRefineryShip.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovRefineryShip.entity
Auto-merging GameInfo/FrigateCovModuleConstructor.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovModuleConstructor.entity
Auto-merging GameInfo/FrigateCovMineLayer.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovMineLayer.entity
Auto-merging GameInfo/FrigateCovLongRange.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovLongRange.entity
Auto-merging GameInfo/FrigateCovLight.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovLight.entity
Auto-merging GameInfo/FrigateCovHeavy.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovHeavy.entity
Auto-merging GameInfo/FrigateCovEnvoy.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovEnvoy.entity
Auto-merging GameInfo/FrigateCovCorvette.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovCorvette.entity
Auto-merging GameInfo/FrigateCovColony.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovColony.entity
Auto-merging GameInfo/FrigateCovCarrier.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovCarrier.entity
Auto-merging GameInfo/FrigateCovAntiFighter.entity
CONFLICT (add/add): Merge conflict in GameInfo/FrigateCovAntiFighter.entity
Auto-merging GameInfo/FRIGATE_UNSCTRADESHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCTRADESHIP.entity
Auto-merging GameInfo/FRIGATE_UNSCTHANATOS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCTHANATOS.entity
Auto-merging GameInfo/FRIGATE_UNSCSTARBASECONSTRUCTOR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCSTARBASECONSTRUCTOR.entity
Auto-merging GameInfo/FRIGATE_UNSCSTALWART.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCSTALWART.entity
Auto-merging GameInfo/FRIGATE_UNSCREFINERYSHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCREFINERYSHIP.entity
Auto-merging GameInfo/FRIGATE_UNSCPROWLER.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCPROWLER.entity
Auto-merging GameInfo/FRIGATE_UNSCPHOENIX.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCPHOENIX.entity
Auto-merging GameInfo/FRIGATE_UNSCPARIS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCPARIS.entity
Auto-merging GameInfo/FRIGATE_UNSCMODULECONSTRUCTOR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCMODULECONSTRUCTOR.entity
Auto-merging GameInfo/FRIGATE_UNSCHALCYON.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCHALCYON.entity
Auto-merging GameInfo/FRIGATE_UNSCGENEVA.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCGENEVA.entity
Auto-merging GameInfo/FRIGATE_UNSCEION.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCEION.entity
Auto-merging GameInfo/FRIGATE_UNSCCRADLE.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCCRADLE.entity
Auto-merging GameInfo/FRIGATE_UNSCCHARON.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCCHARON.entity
Auto-merging GameInfo/FRIGATE_UNSCATHENS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_UNSCATHENS.entity
Auto-merging GameInfo/FRIGATE_MILSPECOPS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_MILSPECOPS.entity
Auto-merging GameInfo/FRIGATE_FLOODTHANATOS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODTHANATOS.entity
Auto-merging GameInfo/FRIGATE_FLOODPICKET.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODPICKET.entity
Auto-merging GameInfo/FRIGATE_FLOODPHOENIX.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODPHOENIX.entity
Auto-merging GameInfo/FRIGATE_FLOODPARIS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODPARIS.entity
Auto-merging GameInfo/FRIGATE_FLOODMAKO.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODMAKO.entity
Auto-merging GameInfo/FRIGATE_FLOODGUARDIAN.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODGUARDIAN.entity
Auto-merging GameInfo/FRIGATE_FLOODEION.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODEION.entity
Auto-merging GameInfo/FRIGATE_FLOODCRS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODCRS.entity
Auto-merging GameInfo/FRIGATE_FLOODCHARON.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODCHARON.entity
Auto-merging GameInfo/FRIGATE_FLOODCCS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODCCS.entity
Auto-merging GameInfo/FRIGATE_FLOODCAR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_FLOODCAR.entity
Auto-merging GameInfo/FRIGATE_COVTRADESHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVTRADESHIP.entity
Auto-merging GameInfo/FRIGATE_COVSTARTGAMEFIX.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVSTARTGAMEFIX.entity
Auto-merging GameInfo/FRIGATE_COVSTARBASECONSTRUCTOR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVSTARBASECONSTRUCTOR.entity
Auto-merging GameInfo/FRIGATE_COVSDV.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVSDV.entity
Auto-merging GameInfo/FRIGATE_COVREFINERYSHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVREFINERYSHIP.entity
Auto-merging GameInfo/FRIGATE_COVPIOUS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVPIOUS.entity
Auto-merging GameInfo/FRIGATE_COVPICKET.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVPICKET.entity
Auto-merging GameInfo/FRIGATE_COVMODULECONSTRUCTOR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVMODULECONSTRUCTOR.entity
Auto-merging GameInfo/FRIGATE_COVMISSIONARY.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVMISSIONARY.entity
Auto-merging GameInfo/FRIGATE_COVMERCY.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVMERCY.entity
Auto-merging GameInfo/FRIGATE_COVINQUISITOR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVINQUISITOR.entity
Auto-merging GameInfo/FRIGATE_COVCRS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVCRS.entity
Auto-merging GameInfo/FRIGATE_COVCPV.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVCPV.entity
Auto-merging GameInfo/FRIGATE_COVCCS.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVCCS.entity
Auto-merging GameInfo/FRIGATE_COVCAR.entity
CONFLICT (add/add): Merge conflict in GameInfo/FRIGATE_COVCAR.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCVALIANT.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCVALIANT.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCTHERMOPYLAEFLAGSHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCTHERMOPYLAEFLAGSHIP.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCTHERMOPYLAE.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCTHERMOPYLAE.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCSUPPORT.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCSUPPORT.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCSUPERCARRIER.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCSUPERCARRIER.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCPHOENIX.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCPHOENIX.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCORION.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCORION.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCMARATHON.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCMARATHON.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCCRUISER.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCCRUISER.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCCOLONY.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCCOLONY.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCCARRIER.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCCARRIER.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCBATTLESHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCBATTLESHIP.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCAUTUMN.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCAUTUMN.entity
Auto-merging GameInfo/CAPITALSHIP_UNSCATHENS.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_UNSCATHENS.entity
Auto-merging GameInfo/CAPITALSHIP_FORESUPPORT.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_FORESUPPORT.entity
Auto-merging GameInfo/CAPITALSHIP_FORESIEGE.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_FORESIEGE.entity
Auto-merging GameInfo/CAPITALSHIP_FORECOLONY.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_FORECOLONY.entity
Auto-merging GameInfo/CAPITALSHIP_FORECARRIER.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_FORECARRIER.entity
Auto-merging GameInfo/CAPITALSHIP_FOREBATTLESHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_FOREBATTLESHIP.entity
Auto-merging GameInfo/CAPITALSHIP_FLOODBATTLESHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_FLOODBATTLESHIP.entity
Auto-merging GameInfo/CAPITALSHIP_COVSUPPORT.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVSUPPORT.entity
Auto-merging GameInfo/CAPITALSHIP_COVSIEGE.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVSIEGE.entity
Auto-merging GameInfo/CAPITALSHIP_COVDESTROYER.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVDESTROYER.entity
Auto-merging GameInfo/CAPITALSHIP_COVDDS.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVDDS.entity
Auto-merging GameInfo/CAPITALSHIP_COVCOLONY.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVCOLONY.entity
Auto-merging GameInfo/CAPITALSHIP_COVCASFLAGSHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVCASFLAGSHIP.entity
Auto-merging GameInfo/CAPITALSHIP_COVCAS.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVCAS.entity
Auto-merging GameInfo/CAPITALSHIP_COVCARRIER.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVCARRIER.entity
Auto-merging GameInfo/CAPITALSHIP_COVBATTLESHIP.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVBATTLESHIP.entity
Auto-merging GameInfo/CAPITALSHIP_COVADJUDICATOR.entity
CONFLICT (add/add): Merge conflict in GameInfo/CAPITALSHIP_COVADJUDICATOR.entity
Auto-merging GameInfo/BuffUNSCHyperion_POINTBLANK.entity
CONFLICT (add/add): Merge conflict in GameInfo/BuffUNSCHyperion_POINTBLANK.entity
Auto-merging GameInfo/BuffUNSCHyperion_BLANK.entity
CONFLICT (add/add): Merge conflict in GameInfo/BuffUNSCHyperion_BLANK.entity
Auto-merging GameInfo/BuffUNSCFlagshipSelf.entity
CONFLICT (add/add): Merge conflict in GameInfo/BuffUNSCFlagshipSelf.entity
Auto-merging GameInfo/BuffUNSCCoordinatedBombardmentSelf.entity
CONFLICT (add/add): Merge conflict in GameInfo/BuffUNSCCoordinatedBombardmentSelf.entity
Auto-merging GameInfo/AbilityUNSCHyperion.entity
CONFLICT (add/add): Merge conflict in GameInfo/AbilityUNSCHyperion.entity
Auto-merging GameInfo/AbilityCovLaserBarrage2.entity
CONFLICT (add/add): Merge conflict in GameInfo/AbilityCovLaserBarrage2.entity
Auto-merging Galaxy/Wrathful.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Wrathful.galaxy
Auto-merging Galaxy/Whirlwind.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Whirlwind.galaxy
Auto-merging Galaxy/Voruk's Labyrinth.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Voruk's Labyrinth.galaxy
Auto-merging Galaxy/Vast Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Vast Random Map.galaxy
Auto-merging Galaxy/Unstable Alliance.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Unstable Alliance.galaxy
Auto-merging Galaxy/Typhoon.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Typhoon.galaxy
Auto-merging Galaxy/Twin Empires.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Twin Empires.galaxy
Auto-merging Galaxy/Triumvirate.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Triumvirate.galaxy
Auto-merging Galaxy/Triple Entente.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Triple Entente.galaxy
Auto-merging Galaxy/Triad.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Triad.galaxy
Auto-merging Galaxy/The Void.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/The Void.galaxy
Auto-merging Galaxy/The Art of War.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/The Art of War.galaxy
Auto-merging Galaxy/Tempest.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Tempest.galaxy
Auto-merging Galaxy/Systems Of War.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Systems Of War.galaxy
Auto-merging Galaxy/Storm Front.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Storm Front.galaxy
Auto-merging Galaxy/SotP Test 4 player WIP.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/SotP Test 4 player WIP.galaxy
Auto-merging Galaxy/SotP 2v2Tournament Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/SotP 2v2Tournament Map.galaxy
Auto-merging Galaxy/SotP 1v1 New.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/SotP 1v1 New.galaxy
Auto-merging Galaxy/Small Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Small Random Map.galaxy
Auto-merging Galaxy/Secrets.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Secrets.galaxy
Auto-merging Galaxy/Razor's Edge.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Razor's Edge.galaxy
Auto-merging Galaxy/RandomTemplate.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/RandomTemplate.galaxy
Auto-merging Galaxy/Quick Strike.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Quick Strike.galaxy
Auto-merging Galaxy/Point Blank.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Point Blank.galaxy
Auto-merging Galaxy/Pandemonium.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Pandemonium.galaxy
Auto-merging Galaxy/New Dawn.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/New Dawn.galaxy
Auto-merging Galaxy/Nemesis.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Nemesis.galaxy
Auto-merging Galaxy/Mini Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Mini Random Map.galaxy
Auto-merging Galaxy/Melting Point.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Melting Point.galaxy
Auto-merging Galaxy/Medium Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Medium Random Map.galaxy
Auto-merging Galaxy/Medium Large Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Medium Large Random Map.galaxy
Auto-merging Galaxy/Maelstrom.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Maelstrom.galaxy
Auto-merging Galaxy/Large Single-System Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Large Single-System Random Map.galaxy
Auto-merging Galaxy/Large Multi-System Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Large Multi-System Random Map.galaxy
Auto-merging Galaxy/Kronac's Cross.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Kronac's Cross.galaxy
Auto-merging Galaxy/Kabel.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Kabel.galaxy
Auto-merging Galaxy/Implosion.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Implosion.galaxy
Auto-merging Galaxy/Hyperion's Gates.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Hyperion's Gates.galaxy
Auto-merging Galaxy/Huge Single-System Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Huge Single-System Random Map.galaxy
Auto-merging Galaxy/Huge Ring Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Huge Ring Random Map.galaxy
Auto-merging Galaxy/Huge Multi-System Random Map.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Huge Multi-System Random Map.galaxy
Auto-merging Galaxy/Hostile Orbits.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Hostile Orbits.galaxy
Auto-merging Galaxy/Grindstone.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Grindstone.galaxy
Auto-merging Galaxy/Gemini.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Gemini.galaxy
Auto-merging Galaxy/Gateway.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Gateway.galaxy
Auto-merging Galaxy/Gaian Crescent.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Gaian Crescent.galaxy
Auto-merging Galaxy/Fulcrum.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Fulcrum.galaxy
Auto-merging Galaxy/FrontEnd.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/FrontEnd.galaxy
Auto-merging Galaxy/Fractured Lands.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Fractured Lands.galaxy
Auto-merging Galaxy/Foreign Invasion.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Foreign Invasion.galaxy
Auto-merging Galaxy/Flashpoint.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Flashpoint.galaxy
Auto-merging Galaxy/Fire And Ice.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Fire And Ice.galaxy
Auto-merging Galaxy/Face Off.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Face Off.galaxy
Auto-merging Galaxy/Entanglement.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Entanglement.galaxy
Auto-merging Galaxy/Empires at War.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Empires at War.galaxy
Auto-merging Galaxy/Double Cross.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Double Cross.galaxy
Auto-merging Galaxy/Doppelgangers.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Doppelgangers.galaxy
Auto-merging Galaxy/Domination.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Domination.galaxy
Auto-merging Galaxy/Devil's Cauldron.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Devil's Cauldron.galaxy
Auto-merging Galaxy/Desperation.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Desperation.galaxy
Auto-merging Galaxy/Derelict.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Derelict.galaxy
Auto-merging Galaxy/Cynosian Rift.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Cynosian Rift.galaxy
Auto-merging Galaxy/Crystal Storm.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Crystal Storm.galaxy
Auto-merging Galaxy/Counter Spin.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Counter Spin.galaxy
Auto-merging Galaxy/Convergence.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Convergence.galaxy
Auto-merging Galaxy/Close Encounters.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Close Encounters.galaxy
Auto-merging Galaxy/Centrifuge.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Centrifuge.galaxy
Auto-merging Galaxy/Celanus Core.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Celanus Core.galaxy
Auto-merging Galaxy/Blitz.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Blitz.galaxy
Auto-merging Galaxy/Blindside.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Blindside.galaxy
Auto-merging Galaxy/Battle Lines.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Battle Lines.galaxy
Auto-merging Galaxy/Balance Of Power.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Balance Of Power.galaxy
Auto-merging Galaxy/Backstab.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Backstab.galaxy
Auto-merging Galaxy/Areolian Sector.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Areolian Sector.galaxy
Auto-merging Galaxy/Ancient Gifts.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Ancient Gifts.galaxy
Auto-merging Galaxy/Agamemnon's Bounty.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/Agamemnon's Bounty.galaxy
Auto-merging Galaxy/3v3PVPMap.galaxy
CONFLICT (add/add): Merge conflict in Galaxy/3v3PVPMap.galaxy
Automatic merge failed; fix conflicts and then commit the result.
s/Frigate_CovModuleConstructor-nm.tga (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/Frigate_CovModuleConstructor-nm.dds (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/Frigate_CovHeavy-nm.tga (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/Frigate_CovHeavy-nm.dds (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/Frigate_CovAntiFighter-nm.tga (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/Frigate_CovAntiFighter-nm.dds (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/FrigateUNSCModuleConstructor-nm.tga (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/FrigateUNSCModuleConstructor-nm.dds (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/CapitalShip_ForeDreadnought-nm.dds (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/CapitalShip_CovCommon-nm.tga (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)
warning: Cannot merge binary files: Textures/CapitalShip_CovCommon-nm.dds (HEAD vs. e7aa64d7f2f43cf903de54e86636f9f536fc08b6)


git did not exit cleanly (exit code 1) (1152161 ms @ 5/21/2014 7:25:49 PM)