[2/2] mahout git commit: [WEBSITE] Build_site.sh lost executable again

[r***@apache.org]

[WEBSITE] Build_site.sh lost executable again


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/f0a246a3
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/f0a246a3
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/f0a246a3

Branch: refs/heads/master
Commit: f0a246a341cdf66e1ff727a469ed268c00b7ebfe
Parents: 2872a30
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Wed Nov 29 13:38:26 2017 -0600
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Wed Nov 29 13:38:26 2017 -0600

----------------------------------------------------------------------
website/build_site.sh | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/f0a246a3/website/build_site.sh
----------------------------------------------------------------------
diff --git a/website/build_site.sh b/website/build_site.sh
index d8502d8..647d21e 100755
--- a/website/build_site.sh
+++ b/website/build_site.sh
@@ -38,8 +38,5 @@ rm -rf *
cp -a $WORKDIR/* .
git add .
git commit -m "Automatic Site Publish by Buildbot"
-<<<<<<< HEAD
git push origin asf-site
-=======
-git push origin asf-site
->>>>>>> e591012439c04e98d669ef9732fde865a9ef76fa
+