switched to template

templates/shortcodes/space.html

@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-<div class="h-20 lg:h-52"></div>
-=======
 
 {% set height = 52 %}
 {% if size %}
@@ -8,5 +5,4 @@
         {% set height = 28 %}
     {% endif %}
 {% endif %}
-<div class="h-20 lg:h-{{height}}"></div>
->>>>>>> template/master
+<div class="h-20 lg:h-{{height}}"></div>