[UN]fix merge conflict

Author: XenoAmess

src/config.js

@@ -213,7 +213,7 @@ global.config = {
 
   myRoom: {
     underAttackMinAttackTimer: 50,
-    leastSpawnsToRebuildStructureSpawn: 1,
+    leastSpawnsToRebuildStructureSpawn: 2,
   },
 
   room: {

src/prototype_room_init.js

@@ -378,10 +378,6 @@ Room.prototype.checkForSpawnPosition = function(pos) {
  * @return {undefined}
  **/
 Room.prototype.checkForMisplacedSpawn = function() {
-  const spawnsCount = Object.keys(Game.spawns).length;
-  if (spawnsCount < config.structureSpawn.leastStructureSpawnToDestroyStructureSpawn) {
-    return;
-  }
   const spawns = this.findMySpawns();
   const spawnsCount = spawns.length;
   if (spawnsCount < config.myRoom.leastSpawnsToRebuildStructureSpawn) {