Merge pull request #607 from apathyboy/master

0.6.1 Release
anhstudios · Jul 8, 2013 · 92d5f1b · 92d5f1b
2 parents 5aaab59 + 7b6a352
commit 92d5f1b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ project(swganh CXX)
 # current version
 set(swganh_VERSION_MAJOR 0)
 set(swganh_VERSION_MINOR 6)
-set(swganh_VERSION_PATCH 0)
+set(swganh_VERSION_PATCH 1)
 set(swganh_VERSION
     ${swganh_VERSION_MAJOR}.${swganh_VERSION_MINOR}.${swganh_VERSION_PATCH})
 

diff --git a/src/swganh/service/datastore.cc b/src/swganh/service/datastore.cc
@@ -79,11 +79,7 @@ std::shared_ptr<Galaxy> Datastore::createGalaxy(
         std::unique_ptr<sql::ResultSet> result(statement->executeQuery());
 
         if (!result->next()) {
-<<<<<<< HEAD
-	    statement->getMoreResults();
-=======
 			statement->getMoreResults();
->>>>>>> develop
             return nullptr;
         }