[WEBSITE] Build_site.sh lost executable again
@@ -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
+
