From: Ant Zucaro <azucaro@gmail.com>
Date: Sat, 14 Jun 2014 12:04:24 +0000 (-0400)
Subject: Disable the merge view for now.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d0c16dddc2861e4e094e488cc357d7c95f584ef;p=xonotic%2Fxonstat.git

Disable the merge view for now.
---

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index da42ca3..6186a67 100644
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -166,7 +166,7 @@ def main(global_config, **settings):
     config.add_route("login", "/login")
     config.add_view(login, route_name="login", check_csrf=True, renderer="json")
 
-    config.add_route("merge", "/merge")
-    config.add_view(merge, route_name="merge", renderer="merge.mako")
+    #config.add_route("merge", "/merge")
+    #config.add_view(merge, route_name="merge", renderer="merge.mako")
 
     return config.make_wsgi_app()