resolve conflict

gitcheng · gitcheng · commit 797f7c868ddb · 2015-01-24T21:17:36.000-08:00
diff --git a/index.html b/index.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 ---
+
 <div class="posts">
   {% for post in site.posts %}
     <article class="post">    
