Resolve conflict in index.md

alexhernandezgarcia · Nov 19, 2024 · f4842b6 · f4842b6
1 parent 35dc590
commit f4842b6
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -11,18 +11,20 @@
     <h1>{{ site.title }}</h1>
     {{ content }}
   </div>
-  <div class="column is-one-fifth content">
-    <div class="has-text-centered content">
-      <h2>News</h2>
-    </div>
-    {% assign news = site.news | sort: 'date' | reverse %}
-    {% for entry in news limit:3 %}
+  {% if page.show_news %}
+    <div class="column is-one-fifth content">
       <div class="has-text-centered content">
-        <h4><a href="{{ entry.url }}">{{ entry.date | date_to_string }} - {{ entry.title }}</a></h4>
-      </div>
-      <div class="has-text-left content">
-        <p>{{ entry.excerpt | markdownify }}</p>
+        <h2>News</h2>
       </div>
-    {% endfor %}
-  </div>
+      {% assign news = site.news | sort: 'date' | reverse %}
+      {% for entry in news limit:3 %}
+        <div class="has-text-centered content">
+          <h4><a href="{{ entry.url }}">{{ entry.date | date_to_string }} - {{ entry.title }}</a></h4>
+        </div>
+        <div class="has-text-left content">
+          <p>{{ entry.excerpt | markdownify }}</p>
+        </div>
+      {% endfor %}
+    </div>
+  {% endif %}
 </div>