cleanup

2020-09-22 18:42:59 +02:00
parent f4003fd463
commit 393ca67291
2 changed files with 0 additions and 10 deletions
--- 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();