Fix merge conflict in c8ace73

Commit c8ace73 has merge conflict not fixed for several months, which was also reported in jesselau76#9 and jesselau76#10.
oo-oo · Sep 19, 2019 · 104dbbc · 104dbbc
1 parent 3af40c5
commit 104dbbc
Showing 1 changed file with 0 additions and 16 deletions.
diff --git 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>