]> git.rm.cloudns.org Git - xonotic/xonstat.git/commitdiff
Disable the merge view for now.
authorAnt Zucaro <azucaro@gmail.com>
Sat, 14 Jun 2014 12:04:24 +0000 (08:04 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sat, 14 Jun 2014 12:04:24 +0000 (08:04 -0400)
xonstat/__init__.py

index da42ca328d8f046b5ae31cd1766eb3d9b2dbeda7..6186a67e60e03ce5188bce292f57ce0161835940 100644 (file)
@@ -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()