merge

whb
Commit 9cb4b18cc56147fea29c60af7721550a39b8e9b8 1 parent 1272f4f6
Showing 1 changed file with 0 additions and 12 deletions
yohobuy/www.yohobuy.com/application/controllers/Index.php
--- a/yohobuy/www.yohobuy.com/application/controllers/Index.php
View file @9cb4b18
+++ b/yohobuy/www.yohobuy.com/application/controllers/Index.php
View file @9cb4b18
- <<<<<<< HEAD
 <?php
 use Action\WebAction;
 class IndexController extends WebAction
@@ -8,15 +7,4 @@ class IndexController extends WebAction
         echo 'hello';
         exit();
     }
- =======
- <?php
- use Action\WebAction;
- class IndexController extends WebAction
- {
-     public function indexAction()
-     {
-         echo 'hello';
-         exit();
-     }
- >>>>>>> 687eb8491b398c6ab714411b3c1bc0cf3c4ccbe8
 }
\ No newline at end of file