From 65492ba8ca9e7e7bc2776c25ee0e7656af641b49 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 10 May 2018 23:37:49 -0400
Subject: [PATCH] Update rpd.ract

---
 tgui/src/interfaces/rpd.ract | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tgui/src/interfaces/rpd.ract b/tgui/src/interfaces/rpd.ract
index 0408f89b03..318b56533f 100644
--- a/tgui/src/interfaces/rpd.ract
+++ b/tgui/src/interfaces/rpd.ract
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-<link rel='ractive' href='./rpd/dirsel.ract'>
-<link rel='ractive' href='./rpd/colorsel.ract'>
-
-{{#if data.mode >= 0}}
-	<dirsel/>
-{{/if}}
-{{#if data.mode == -2 || data.mode == 0}}
-	<colorsel/>
-=======
 <link rel='stylesheet' href='spritesheet_pipes.css'>
 
 <ui-display title='Direction'>
@@ -27,7 +17,6 @@
 				action='color' params='{"paint_color": {{@key}}}'>{{@key}}</ui-button>
 		{{/each}}
 	</ui-display>
->>>>>>> cf6f064... Use spritesheets to reduce time spent sending PNG assets by 90+% (#37399)
 {{/if}}
 <ui-display title='Utilities'>
 	<ui-section>