Reconfigure the merge view a bit.

[xonotic/xonstat.git] / xonstat / views / __init__.py

diff --git a/xonstat/views/__init__.py b/xonstat/views/__init__.py
index bdc53ba0a8e2137bbda2b02ba2c1aafa1d58e15d..85fd2caf81c36fdff8ab837cbffc1a820e407607 100644 (file)
--- a/xonstat/views/__init__.py
+++ b/xonstat/views/__init__.py
@@ -29,4 +29,4 @@ from xonstat.views.exceptions   import notfound
 from xonstat.views.main   import main_index, top_players_by_time, top_servers_by_players
 from xonstat.views.main   import top_servers_by_players, top_maps_by_times_played
 
-from xonstat.views.admin   import forbidden, login
+from xonstat.views.admin   import forbidden, login, merge