diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-20 18:58:58 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-20 18:58:58 +0200 |
| commit | abbad9ea53e81c6e3211029711ac5b2ab4f1978d (patch) | |
| tree | 9a4d5a8587da1dd3a365251afa37be2f835a53c2 /system/database/drivers/mysql/mysql_result.php | |
| parent | 71644d683d0a15a6f7e04fabd0f51a4200d620b4 (diff) | |
| parent | d56be70257696d0bbf2dcc880888d8dc17cba21c (diff) | |
Merge branch 'develop' into feature/unit-tests
Conflicts:
.hgignore
Diffstat (limited to 'system/database/drivers/mysql/mysql_result.php')
| -rw-r--r-- | system/database/drivers/mysql/mysql_result.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php index 19875ba9d..507389603 100644 --- a/system/database/drivers/mysql/mysql_result.php +++ b/system/database/drivers/mysql/mysql_result.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'); /** * CodeIgniter * @@ -120,7 +120,7 @@ class CI_DB_mysql_result extends CI_DB_result { /** * Data Seek * - * Moves the internal pointer to the desired offset. We call + * Moves the internal pointer to the desired offset. We call * this internally before fetching results to make sure the * result set starts at zero * |