Merge branch 'develop' of gitee.com:gongfuxiang/shopxo into develop

2018-12-29 15:44:57 +08:00 · 2018-12-29 15:44:57 +08:00 · 0eb3c23b77
parent 61b542f1b6 4e1d8d2ba7
commit 0eb3c23b77
2 changed files with 11 additions and 2 deletions
--- a/Crazy.php
+++ b/Crazy.php
@ -0,0 +1,10 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Crazy
+ * Email: crazys@126.com
+ * Date: 2018/12/29
+ * Time: 11:13
+ */
+
+$test='这是一个测试文件，用来测试Pull Request贡献代码的。';
--- a/index.php
+++ b/index.php
@ -13,5 +13,4 @@
 define('IS_ROOT_ACCESS', true);

 // 引入公共入口文件
-require './public/index.php';
-?>
+require './public/index.php';