From ee2b05dc8da14c87e03ea0c47a51e77bb63a8606 Mon Sep 17 00:00:00 2001
From: Andre Antunes <odarone@gmail.com>
Date: Thu, 7 Apr 2011 05:48:10 -0300
Subject: [PATCH] fixing merge

---
 src/framework/engine.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/framework/engine.cpp b/src/framework/engine.cpp
index 5c95dc10..200dea5a 100644
--- a/src/framework/engine.cpp
+++ b/src/framework/engine.cpp
@@ -108,8 +108,7 @@ void Engine::run()
             
             // swap buffers
             Platform::swapBuffers();
-<<<<<<< HEAD
-            
+           
             /*
             static ConnectionPtr connection = g_connections.createConnection();
             
@@ -127,9 +126,7 @@ void Engine::run()
             }
             */
         //}
-=======
         }
->>>>>>> f3eaf3f7262bf6ef35cee745d40088669526125a
     }
 
     m_stopping = false;