reset gitignore

.gitignore

-/runtime/*
-/.idea/*
-/thinkphp/*
-/vendor/*
-/phpmyadmin/*
+/runtime
+/.idea
+/thinkphp
+/vendor
+/phpmyadmin
 /.travis.yml
 /.user.ini
 /build.php
@@ -13,8 +13,9 @@
 /README.md
 /think
 /config/database.php
-/public/dist/*
-/public/dist2/*
-/public/static/uploads/*
-/public/static/xadmin/*
-/config/*
\ No newline at end of file
+/config/cache.php
+/public/dist
+/public/dist2
+/public/static/uploads
+/public/static/xadmin
+/config
\ No newline at end of file

config/cache.php

@@ -28,7 +28,11 @@ return [
     ],
     'redis' =>  [
       'type'    =>  'redis',
+<<<<<<< HEAD
       'host'    =>  '192.168.1.222',
+=======
+      'host'    =>  '192.168.1.70',
+>>>>>>> 7401ee352f71efe59eaba5edf51c76690db86c37
       // 全局缓存有效期（0为永久有效）
       'expire'=>  0, 
       // 缓存前缀

config/database.php

@@ -13,13 +13,21 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
+<<<<<<< HEAD
     'hostname'        => '192.168.1.214',
+=======
+    'hostname'        => '192.168.1.70',
+>>>>>>> 7401ee352f71efe59eaba5edf51c76690db86c37
     // 数据库名
     'database'        => 'gonn',
     // 用户名
     'username'        => 'gonn',
     // 密码
+<<<<<<< HEAD
     'password'        => 'gonn.123',
+=======
+    'password'        => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX',
+>>>>>>> 7401ee352f71efe59eaba5edf51c76690db86c37
     // 端口
     'hostport'        => '10036',