Merge pull request #3 from jiangzhonglian/master

修改配置文件，再试试合并效果

Merge pull request #3 from jiangzhonglian/master
修改配置文件，再试试合并效果
03454b0d · 片刻小哥哥 · GitHub · 224a7486 · a15cfc21 · 03454b0d
隐藏空白更改
内联并排

Showing with 1 addition and 2 deletion

.gitignore .gitignore +0 -1

.travis.yml .travis.yml +1 -1

未找到文件。
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,6 @@ instance/

 # Sphinx documentation
 _book/
-
 docs/_build/

 # PyBuilder

--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ after_script:
  - git config user.email ${GH_EMAIL}
  - git add -A
  - git commit -am "$(date "+%Y-%m-%d %H:%M:%S")"
-  - git push "https://${GH_TOKEN}@github.com/${GH_USER}/${GH_REPO}.git" master:${GH_BRANCH} -f
+  - git push --force --quiet "https://${GH_TOKEN}@github.com/${GH_USER}/${GH_REPO}.git" master:${GH_BRANCH}

 env:
  global: