From 67d0b77b0ac74af4ab6e5b9cf987357d8a381a4f Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 9 Apr 2016 14:25:25 -0700
Subject: [PATCH] Fix bug from c94545e01be8c5aded827ec327b4281e4b7c268a causing
 webpage merges into gh-pages to fail.

---
 Gruntfile.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 3306c1488..7c76c3d9a 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -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: