From ade37b7f53f1d3e8e5057251dd0840ed2c7cb645 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 12 Jul 2025 22:45:15 +0100 Subject: [PATCH] Delete conflict file --- ...sync-conflict-20240821-224633-UAU7ZWL.twig | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 source/_layouts/base.html.sync-conflict-20240821-224633-UAU7ZWL.twig diff --git a/source/_layouts/base.html.sync-conflict-20240821-224633-UAU7ZWL.twig b/source/_layouts/base.html.sync-conflict-20240821-224633-UAU7ZWL.twig deleted file mode 100644 index 248d09572..000000000 --- a/source/_layouts/base.html.sync-conflict-20240821-224633-UAU7ZWL.twig +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - {{ site.name|default('Sculpin Skeleton') }} - - - {% block body %} -

{% block page_title %}{{ page.title }}{% endblock %}

- - {% block content_wrapper %} - {% block content %}{% endblock %} - {% endblock %} - -
- - - {% endblock %} - -