From 8e5d87b78015d7dba0ee286e316075fe4338cdb5 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sat, 17 Mar 2018 19:45:24 -0400
Subject: [PATCH] Update machines.dm

---
 code/__DEFINES/machines.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm
index f78c500462..2d088552bd 100644
--- a/code/__DEFINES/machines.dm
+++ b/code/__DEFINES/machines.dm
@@ -85,8 +85,6 @@
 #define SUPERMATTER_DANGER 4		// Integrity < 50%
 #define SUPERMATTER_EMERGENCY 5		// Integrity < 25%
 #define SUPERMATTER_DELAMINATING 6	// Pretty obvious.
-<<<<<<< HEAD
-=======
 
 //Nuclear bomb stuff
 #define NUKESTATE_INTACT		5
@@ -100,4 +98,3 @@
 #define NUKE_OFF_UNLOCKED	1
 #define NUKE_ON_TIMING		2
 #define NUKE_ON_EXPLODING	3
->>>>>>> 7639492... Added clown ops game mode, and several clown weapons. (#36459)