From 730b29e5cbcc8c1ccb31847a5e668e23f5b725be Mon Sep 17 00:00:00 2001
From: Kallfaktorn <mattiaspgames@gmail.com>
Date: Fri, 4 Feb 2011 14:21:48 +0100
Subject: [PATCH] Moving ggs_server parts to ggs_network. Stop method changed.

---
 src/ggs_server.erl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/ggs_server.erl b/src/ggs_server.erl
index f6131a2..41cfee3 100644
--- a/src/ggs_server.erl
+++ b/src/ggs_server.erl
@@ -57,10 +57,7 @@ _echo()     -> gen_server:call(?SERVER, {_echo, RefID, _, MSG}).
 %% @end
 %%-----------------------------------------------------
 stop() ->
-<<<<<<< HEAD
     ggs_network:stop().
-=======
-    gen_server:cast(?SERVER, stop).
 
 %%-----------------------------------------------------
 %% gen_server callbacks