From ddb842bd1ae236cd6250ed2c91a564779c98e512 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 16 Nov 2017 12:52:38 -0500
Subject: [PATCH] Update portable_scrubber.ract

---
 tgui/src/interfaces/portable_scrubber.ract | 40 ----------------------
 1 file changed, 40 deletions(-)

diff --git a/tgui/src/interfaces/portable_scrubber.ract b/tgui/src/interfaces/portable_scrubber.ract
index 1cd4bd9720..3f89775ee2 100644
--- a/tgui/src/interfaces/portable_scrubber.ract
+++ b/tgui/src/interfaces/portable_scrubber.ract
@@ -1,42 +1,3 @@
-<<<<<<< HEAD
-<ui-notice>
-  <span>The regulator {{data.holding ? "is" : "is not"}} connected to a tank.</span>
-</ui-notice>
-<ui-display title='Status' button>
-  <ui-section label='Pressure'>
-    <span>{{Math.round(adata.pressure)}} kPa</span>
-  </ui-section>
-  <ui-section label='Port'>
-    <span class='{{data.connected ? "good" : "average"}}'>{{data.connected ? "Connected" : "Not Connected"}}</span>
-  </ui-section>
-</ui-display>
-<ui-display title='Filter'>
-  <ui-section label='Power'>
-    <ui-button icon='{{data.on ? "power-off" : "close"}}'
-      style='{{data.on ? "selected" : "null"}}'
-      action='power'>{{data.on ? "On" : "Off"}}</ui-button>
-  </ui-section>
-</ui-display>
-<ui-display title='Holding Tank' button>
-  {{#partial button}}
-    {{#if data.holding}}
-      <ui-button icon='eject' style='{{data.on ? "danger" : null}}' action='eject'>Eject</ui-button>
-    {{/if}}
-  {{/partial}}
-  {{#if data.holding}}
-		<ui-section label='Label'>
-			{{data.holding.name}}
-		</ui-section>
-		<ui-section label='Pressure'>
-			{{Math.round(adata.holding.pressure)}} kPa
-		</ui-section>
-	{{else}}
-		<ui-section>
-			<span class='average'>No Holding Tank</span>
-		</ui-section>
-	{{/if}}
-</ui-display>
-=======
 <link rel='ractive' href='./scrubbing_types.ract' name='filters'>
 
 <ui-notice>
@@ -81,4 +42,3 @@
     <filters/>
   {{/with}}
 </ui-display>
->>>>>>> 33f2f2f... Atmos Filter/Scrubber UI update (#32746)