Fix conflict #27

willianjusten · May 20, 2016 · 453f145 · 453f145
1 parent 88aaa55
commit 453f145
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/initpost.sh b/initpost.sh
@@ -63,11 +63,7 @@ if [[ "${1}" == "-p" || "${1}" == "--publish" ]]; then
 fi
 
 # Set your blog URL
-<<<<<<< HEAD
-BLOG_URL="http://vsential.com"
-=======
 BLOG_URL="your_site"
->>>>>>> gh-pages
 
 # Set your assets URL
 ASSETS_URL="assets/img/"