summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-04-23 14:58:42 +0200
committerTimothy Warren <tim@timshomepage.net>2012-04-23 14:58:42 +0200
commit31d30bcf206ed2e9168b93f74511708d6bc4b505 (patch)
treee56f47c8fcf05dae7bf243a79ee8a38b865d83a7
parentbb8ae01bff0fa7cb3b14fb5f1310d944c414cf81 (diff)
Merge upstream
-rwxr-xr-xsystem/core/CodeIgniter.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 9714d095c..7deccd048 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -25,8 +25,6 @@
* @filesource
*/
-// ------------------------------------------------------------------------
-
/**
* System Initialization File
*
@@ -406,4 +404,4 @@
}
/* End of file CodeIgniter.php */
-/* Location: ./system/core/CodeIgniter.php */
+/* Location: ./system/core/CodeIgniter.php */ \ No newline at end of file