测试

protected/model/accountItem.php

@@ -27,11 +27,8 @@ class accountItem extends DooModel {
 	 * 
 	 */
 	function getAccountItem(){
-<<<<<<< HEAD
+
 		$sql = 'select category
-=======
-		$sql = 'select category, count(*) as itemCount
->>>>>>> 74b60f9f1fb09be40f942fc394c787fb1a0f21cb
 				from ' . $this->_table . '
 						 GROUP BY category ORDER BY  aid ASC  ';
 		$query = Doo::db ()->query ( $sql );