From 637d1c313bfe94cca7fdd8e4cde85f397e5b24ba Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes Pueyo <shoghicp@gmail.com>
Date: Sat, 29 Dec 2012 02:54:39 +0100
Subject: [PATCH] Changed version to next release

---
 src/common/config.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/common/config.php b/src/common/config.php
index e9f53bd79..7623e8a8d 100644
--- a/src/common/config.php
+++ b/src/common/config.php
@@ -40,4 +40,8 @@ define("CURRENT_VERSION", 1);
 define("LOG", true);
 define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78");
 define("TEST_MD5", "5ca8eced50a5801619f7ae86d631a4e7");
-define("MAJOR_VERSION", "Alpha_1.0.2");
\ No newline at end of file
+<<<<<<< HEAD
+define("MAJOR_VERSION", "Alpha_1.0.2");
+=======
+define("MAJOR_VERSION", "Alpha_1.1");
+>>>>>>> Changed version to next release