Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug from c94545e01be8c5aded827ec327b4281e4b7c268a causing webpage merges into gh-pages to fail.

Browse Source
This commit is contained in:
ccd0 2016-04-09 14:25:25 -07:00
parent 90ea7e98ed
commit 67d0b77b0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.coffee
View File

@ -164,8 +164,8 @@ module.exports = (grunt) ->
command: 'git commit -am "Build web page."'
web:
command: """
git merge --no-commit -s ours -
git checkout - README.md index.html web.css img
git merge --no-commit -s ours master
git checkout master README.md index.html web.css img
git commit -am "Update web page."
""".split('\n').join('&&')
push: