Fix merge conflict, change indentation a bit.
[xonotic/xonstat.git] / xonstat / views / __init__.py
index 2d50a19699f1e46956c08bafa291fc970959dbfc..f42c7855ec5b245ac92788e67ea27a994d410d18 100644 (file)
@@ -1,12 +1,21 @@
 from xonstat.views.submission import stats_submit
-from xonstat.views.player import player_index,      player_info,      player_game_index,      player_accuracy
-from xonstat.views.player import player_index_json, player_info_json, player_game_index_json, player_accuracy_json
-from xonstat.views.game   import game_index,      game_info,      rank_index
+from xonstat.views.player import player_index, player_info, player_game_index
+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, 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_json, server_game_index_json, server_index_json
+
+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_json
+
 from xonstat.views.main   import main_index