fixing merge conflict

2016-11-09 22:41:34 -08:00
parent 2db15f4e4d 4ff130f138
commit 3ab34f793f
4 changed files with 45 additions and 1 deletions
--- a/_config.yml
+++ b/_config.yml
@ -20,7 +20,7 @@ disqus_shortname: idrbwjekyll
 host: 127.0.0.1
 # the preview server used. Leave as is.

-port: 4005
+port: 4000
 # the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts. in that case, use another port such as 4006.

 exclude: