summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/root.jsx1
1 files changed, 0 insertions, 1 deletions
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}