Fix merge conflict, change indentation a bit.

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

diff --git a/xonstat/views/__init__.py b/xonstat/views/__init__.py
index 525d2f9d353357a1edf22b543962e4aa33866c07..f42c7855ec5b245ac92788e67ea27a994d410d18 100644 (file)
--- a/xonstat/views/__init__.py
+++ b/xonstat/views/__init__.py
@@ -1,8 +1,21 @@
 from xonstat.views.submission import stats_submit
 from xonstat.views.player import player_index, player_info, player_game_index
 from xonstat.views.submission import stats_submit
 from xonstat.views.player import player_index, player_info, player_game_index

-from xonstat.views.player import player_accuracy_json, player_damage_json
-from xonstat.views.game import game_index, game_info, rank_index
-from xonstat.views.map import map_info, map_index, map_index_json
+from xonstat.views.player import player_accuracy
+from xonstat.views.player import player_index_json, player_info_json,
+from xonstat.views.player import player_game_index_json, player_accuracy_json
+from xonstat.views.player import player_damage_json
+
+from xonstat.views.game   import game_index, game_info, rank_index
+from xonstat.views.game   import game_index_json, game_info_json, rank_index_json
+
+from xonstat.views.map    import map_info, map_index
+from xonstat.views.map    import map_info_json, map_index_json
+

 from xonstat.views.server import server_info, server_game_index, server_index
 from xonstat.views.server import server_info, server_game_index, server_index

+from xonstat.views.server import server_info_json, server_game_index_json
+from xonstat.views.server import server_index_json
+

 from xonstat.views.search import search_q, search
 from xonstat.views.search import search_q, search

-from xonstat.views.main import main_index
+from xonstat.views.search import search_json
+
+from xonstat.views.main   import main_index