From 8f41d89a3ca8bfaa506940de27979238519c7290 Mon Sep 17 00:00:00 2001
From: /jedi/ <mail@j3d1.de>
Date: Wed, 28 Sep 2016 03:45:59 +0200
Subject: [PATCH] fixes merge bug

---
 game/game_window.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/game_window.hpp b/game/game_window.hpp
index 884a628..defd766 100644
--- a/game/game_window.hpp
+++ b/game/game_window.hpp
@@ -47,11 +47,11 @@ protected:
             drawTrace(trace);
         }
 
-        for (const game::Explosion *explosion : m_game.state()->explosions) {
+        for (const game::Explosion *explosion : m_game->state()->explosions) {
             drawExplosion(explosion);
         }
 
-        for (const game::Ship *ship : m_game.state()->ships) {
+        for (const game::Ship *ship : m_game->state()->ships) {
             drawShip(ship->position);
         }