From f3033fffd2a8ab1f0f6d7724c904cd83fc96b8ac Mon Sep 17 00:00:00 2001
From: SpitfireX <timm.weber@me.com>
Date: Wed, 12 Aug 2015 19:07:48 +0200
Subject: merge conflict fixed

---
 main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main.py')

diff --git a/main.py b/main.py
index d747869..ee053ea 100644
--- a/main.py
+++ b/main.py
@@ -37,7 +37,7 @@ c.player.nick="test cell pls ignore"
 gui.set_client(c)
 
 # initialize strategy
-strategy = Strategy()
+strategy = Strategy(c)
 
 # main loop
 while True:
@@ -46,7 +46,7 @@ while True:
     gui.draw_frame()
     
     if len(list(c.player.own_cells)) > 0:
-        target = strategy.process_frame(c)
+        target = strategy.process_frame()
 
         if gui.bot_input:
             c.send_target(target[0], target[1])
-- 
cgit v1.2.3