From 104dbbc757be494529c1d9e4bce3b7502773d8c2 Mon Sep 17 00:00:00 2001
From: Wenfeng CAI <xoxyzox-m@yahoo.com>
Date: Thu, 19 Sep 2019 13:34:09 +0800
Subject: [PATCH] Fix merge conflict in c8ace73

Commit c8ace73 has merge conflict not fixed for several months, which
was also reported in #9 and #10.
---
 layouts/_default/list.html | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index fb15e64..7b48a57 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -90,7 +90,6 @@ <h4><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h4>
                
       </header>
 
-<<<<<<< HEAD
     <div class="w3-container wraptext w3-white">
       <code> {{ .Date.Format "2006/01/02" }} </code>
       
@@ -104,21 +103,6 @@ <h4><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h4>
       </p>
 
     </div>
-=======
-      <div class="w3-container wraptext w3-white">
-        <code> {{ .Date.Format "2006/01/02" }} </code>
-              
-            
-        {{ if gt (len .Summary) 200 }}
-
-    
-        <p>{{substr .Summary 0 200 }}...</p>
-    
-    
-      {{ end }}
-        
-      </div>
->>>>>>> dev
 
       <footer >
         <a href="{{ .Permalink }}"><button class="w3-button w3-blue w3-block w3-hover-green">{{ T "readMore" }}</button></a>