diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-14 20:10:55 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-14 20:10:55 +0200 |
| commit | d8ef630f2d4d32eee998969e548d36dc629340d4 (patch) | |
| tree | 92a509fda736fb9a6a119dcb6b16c40607ed0fa5 /system/core/CodeIgniter.php | |
| parent | 02d45b56c57f6cf9f8c0fabe7f8b7ed761bd5a9b (diff) | |
| parent | c2a37669107829b032b08562e784416713f569b1 (diff) | |
Fixed conflict.
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rwxr-xr-x[-rw-r--r--] | system/core/CodeIgniter.php | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index a8895d6a9..5f795514f 100644..100755 --- 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); |