fix conflicts

codeigniter4 · Apr 5, 2020 · 654b915 · 654b915
1 parent f05ee25
commit 654b915
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -1000,7 +1000,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
 				throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
 			}
 
-			return this;
+			return $this;
 		}
 
 		if ($values === null || (! is_array($values) && ! ($values instanceof Closure)))
@@ -1010,7 +1010,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
 				throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
 			}
 
-			return this;
+			return $this;
 		}
 
 		is_bool($escape) || $escape = $this->db->protectIdentifiers;