refs #1681 : added - SessionVisit flush routine.

-
Needlworks · Jul 21, 2014 · c934e5c · c934e5c
1 parent 897c7e2
commit c934e5c
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/framework/data/DBModel.php b/framework/data/DBModel.php
@@ -161,12 +161,8 @@ public function setOrder($standard, $order = 'ASC') {
 	}
 
 	public function unsetOrder() {
-<<<<<<< HEAD
-		$this->_order = array();	
-=======
 		$this->_order = array();
 		return $this;
->>>>>>> 3aa6a8b...  refs #1681 : added - SessionVisit flush routine.
 	}
 
 	public function setLimit($count, $offset = 0) {
@@ -175,12 +171,8 @@ public function setLimit($count, $offset = 0) {
 	}
 
 	public function unsetLimit() {
-<<<<<<< HEAD
-		$this->_limit = array();	
-=======
 		$this->_limit = array();
 		return $this;
->>>>>>> 3aa6a8b...  refs #1681 : added - SessionVisit flush routine.
 	}
 
 	public function doesExist($field = '*') {