do add page cache and data cache master slave mode

@@ -160,7 +160,6 @@ class AbstractAction extends Controller_Abstract
     {
         return $this->request->getCookie($name, $default);
     }
-<<<<<<< HEAD
     
     /**
      * 设置缓存
@@ -190,8 +189,6 @@ class AbstractAction extends Controller_Abstract
             return Cache::get($key, 'slave');
         }
     }
-=======
->>>>>>> f2e969821fc34609236046c915106ed001552ab8
 
     /*
      * 设置网站SEO的标题