From 393ca67291d69ed80223fbec40378641f50361f0 Mon Sep 17 00:00:00 2001
From: J-VdS <jeroen.vanderstraeten@ugent.be>
Date: Tue, 22 Sep 2020 18:42:59 +0200
Subject: [PATCH] cleanup

---
 core/src/mindustry/game/Rules.java         | 5 -----
 core/src/mindustry/input/DesktopInput.java | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java
index 5cf90b9de5..7be274bbef 100644
--- a/core/src/mindustry/game/Rules.java
+++ b/core/src/mindustry/game/Rules.java
@@ -40,15 +40,10 @@ public class Rules{
     public boolean reactorExplosions = true;
     /** Whether schematics are allowed */
     public boolean schematicAllowed = true;
-<<<<<<< HEAD
-=======
-    /** Whether copying is allowed */
-    public boolean copyAllowed = true;
     /** Whether friendly explosions can occur and set fire/damage other blocks. */
     public boolean damageExplosions = true;
     /** Whether fire is enabled. */
     public boolean fire = true;
->>>>>>> fee15caf7aa42f112eebe4c465885b6c37fd51a5
     /** Whether units use and require ammo. */
     public boolean unitAmmo = false;
     /** How fast unit pads build units. */
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index dfea18f26c..47538f7f23 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -344,12 +344,7 @@ public class DesktopInput extends InputHandler{
 
         table.button(Icon.paste, Styles.clearPartiali, () -> {
             ui.schematics.show();
-<<<<<<< HEAD
         }).tooltip("Schematics");
-=======
-
-        }).tooltip("@schematics").disabled(d -> !state.rules.schematicAllowed);
->>>>>>> fee15caf7aa42f112eebe4c465885b6c37fd51a5
 
         table.button(Icon.tree, Styles.clearPartiali, () -> {
             ui.research.show();