From 6a101292c74d33e542e47f8e54fff5a5389bf2ef Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 30 Mar 2016 09:19:13 -0400
Subject: Removed changes introduced by a merge that somehow didn't break
 anything

---
 webapp/root.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/root.jsx b/webapp/root.jsx
index ddac0658b..fca368bdb 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -283,7 +283,6 @@ function renderRootComponent() {
                             />
                         </Route>
                     </Route>
->>>>>>> Added initial backstage components and InstalledIntegrations page
                     <Route
                         path='admin_console'
                         component={AdminConsole}
-- 
cgit v1.2.3-1-g7c22