commit d8ef630f2d4d32eee998969e548d36dc629340d4
author Phil Sturgeon <email@philsturgeon.co.uk> Sun Aug 14 12:10:55 2011 -0600
committer Phil Sturgeon <email@philsturgeon.co.uk> Sun Aug 14 12:10:55 2011 -0600
tree 92a509fda736fb9a6a119dcb6b16c40607ed0fa5
parent 02d45b56c57f6cf9f8c0fabe7f8b7ed761bd5a9b
parent c2a37669107829b032b08562e784416713f569b1

Fixed conflict.

system/core/CodeIgniter.php

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
old mode 100644
new mode 100755
index a8895d6..5f79551
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -27,17 +27,19 @@
  * @link		http://codeigniter.com/user_guide/
  */
 
-/*
- * ------------------------------------------------------
- *  Define the CodeIgniter Version
- * ------------------------------------------------------
+/**
+ * CodeIgniter Version
+ *
+ * @var string
+ *
  */
-	define('CI_VERSION', '2.1.0-dev');
+	define('CI_VERSION', '2.0.2');
 
-/*
- * ------------------------------------------------------
- *  Define the CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
- * ------------------------------------------------------
+/**
+ * CodeIgniter Branch (Core = TRUE, Reactor = FALSE)
+ *
+ * @var boolean
+ *
  */
 	define('CI_CORE', FALSE);