summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-12-23 14:59:42 +0100
committerAndrey Andreev <narf@devilix.net>2014-12-23 14:59:42 +0100
commitc36d3a99727c78cc8ee25074704b50114743ca72 (patch)
tree237bf6ec98625b047a3fa9e69b84da7fb008861d /system/core
parent8ec7a153d18a744a73b7397789e247d7652a40ce (diff)
parent72d63cdb448284251a2fccb45f509117e45ea2b9 (diff)
Merge pull request #3437 from galdiolo/develop
[ci skip] fix a comment typo
Diffstat (limited to 'system/core')
-rw-r--r--system/core/CodeIgniter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 88e730bc3..b1da42d54 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -145,7 +145,7 @@ if ( ! is_php('5.4'))
* The subclass prefix allows CI to know if a core class is
* being extended via a library in the local application
* "libraries" folder. Since CI allows config items to be
- * overriden via data set in the main index.php file,
+ * overridden via data set in the main index.php file,
* before proceeding we need to know if a subclass_prefix
* override exists. If so, we will set this value now,
* before any classes are loaded