diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-07-02 00:54:49 +0200 |
| commit | 8f371a4954ec84f9ea80c26e654a4793714f8a07 (patch) | |
| tree | 912d83e6e2adbe136d892f0a41ea1730dc11206a /application/config/constants.php | |
| parent | 806b82448ddccece1311228519dc1410dacd0971 (diff) | |
| parent | 4b9c62980599228f070b401c7673dce8085b0c61 (diff) | |
hand merged remaining unresolved files following the backout of 648b42a75739, which was a NON-trivial whitespace commit
Diffstat (limited to 'application/config/constants.php')
| -rw-r--r-- | application/config/constants.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/application/config/constants.php b/application/config/constants.php index edaefe86b..4a879d360 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -1,4 +1,4 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /* |-------------------------------------------------------------------------- @@ -6,10 +6,10 @@ |-------------------------------------------------------------------------- | | These prefs are used when checking and setting modes when working -| with the file system. The defaults are fine on servers with proper +| with the file system. The defaults are fine on servers with proper | security, but you may wish (or even need) to change the values in | certain environments (Apache running a separate process for each -| user, PHP under CGI with Apache suEXEC, etc.). Octal values should +| user, PHP under CGI with Apache suEXEC, etc.). Octal values should | always be used to set the mode correctly. | */ |