diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 09:19:13 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 09:19:13 -0400 |
| commit | 6a101292c74d33e542e47f8e54fff5a5389bf2ef (patch) | |
| tree | 45985761b264da5443d866c01e512d84a715b65f /webapp | |
| parent | 132d4cdf8f01b068ec9c343a4ecbf1e7e23e19e5 (diff) | |
| download | chat-6a101292c74d33e542e47f8e54fff5a5389bf2ef.tar.gz chat-6a101292c74d33e542e47f8e54fff5a5389bf2ef.tar.bz2 chat-6a101292c74d33e542e47f8e54fff5a5389bf2ef.zip | |
Removed changes introduced by a merge that somehow didn't break anything
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/root.jsx | 1 |
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} |