summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/cubrid/cubrid_result.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:15:36 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-04-26 23:15:36 +0200
commitba4636187a745a287c81517fbc53f2f30fe16d88 (patch)
treebdcb56cc80e72735d0118f3abf91e04f0dfba5cd /system/database/drivers/cubrid/cubrid_result.php
parentcdfbd5281e4dec7278a07943832c2590c1141eb3 (diff)
parentf3b0074b0ccaadef31737cbd6be21ec7272f7538 (diff)
Fixed conflicts.
Diffstat (limited to 'system/database/drivers/cubrid/cubrid_result.php')
-rw-r--r--system/database/drivers/cubrid/cubrid_result.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/drivers/cubrid/cubrid_result.php b/system/database/drivers/cubrid/cubrid_result.php
index 6a61a213d..58dcff29a 100644
--- a/system/database/drivers/cubrid/cubrid_result.php
+++ b/system/database/drivers/cubrid/cubrid_result.php
@@ -163,7 +163,7 @@ class CI_DB_cubrid_result extends CI_DB_result {
* this internally before fetching results to make sure the
* result set starts at zero
*
- * @return array
+ * @return bool
*/
protected function _data_seek($n = 0)
{