refs #514 : merge error fixed.

Needlworks · Oct 2, 2012 · cbb9351 · cbb9351
1 parent 886ce55
commit cbb9351
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -5,21 +5,11 @@
 
 // Define basic signatures.
 define('TEXTCUBE_NAME', 'Textcube');
-<<<<<<< local
 define('TEXTCUBE_VERSION', '2.1 : Alpha 1');
 define('TEXTCUBE_REVISION', 'root-main-trunk');
-define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2011. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
-=======
-define('TEXTCUBE_VERSION', '2.0 : Alpha 1');
-define('TEXTCUBE_REVISION', 'root-main-branch2.0-r30');
 define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2012. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
->>>>>>> other
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');
-<<<<<<< local
 define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/trunk');
-=======
-define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/2.0');
->>>>>>> other
 define('TEXTCUBE_NOTICE_URL','http://feeds.feedburner.com/textcube/');
 // Define basic definitions.
 define('CRLF', "\r\n");