php boy 冲突修改

@@ -379,7 +379,6 @@ class BoysController extends AbstractAction
 		);
         $this->_view->display('index', $data);
     }
-<<<<<<< HEAD
     /**
      * 男装首页 新品上架 接口数据
      * 
@@ -441,7 +440,7 @@ class BoysController extends AbstractAction
         } while (false);
 
         $this->echoJson($result);
-=======
+    }
 
     public function getBrandAction() 
     {
@@ -705,7 +704,7 @@ class BoysController extends AbstractAction
                 )
             )
         );
+
         $this->echoJson($data);
->>>>>>> 7fd5a2330835d91a4ededdd472e709de14dca3ee
     }
 }
\ No newline at end of file