diff --git a/public/index.php b/public/index.php index a0c3143..e60f0f5 100644 --- a/public/index.php +++ b/public/index.php @@ -34,12 +34,9 @@ define('RUNTIME_PATH', CMF_ROOT . 'data/runtime/'); // 定义CMF 版本号 define('BRONET_VERSION', '5.0.170927'); -<<<<<<< HEAD -======= ->>>>>>> 7ef7c2626ab691a0371387a23bc7e7c4f4ef415d // 加载框架基础文件 require CMF_ROOT . 'simplewind/thinkphp/base.php'; // 执行应用 -\think\App::run()->send(); +\think\App::run()->send(); \ No newline at end of file