From d43f6db4fab0b144faa59b7e9ce245a4a52315a6 Mon Sep 17 00:00:00 2001
From: mordaroso <mordaroso@gmail.com>
Date: Thu, 7 Mar 2024 10:33:18 +0100
Subject: [PATCH] Fix merge conflict

---
 templates/login.liquid | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/templates/login.liquid b/templates/login.liquid
index 86de0c8..6226551 100644
--- a/templates/login.liquid
+++ b/templates/login.liquid
@@ -45,12 +45,8 @@
         height: 100px;
         margin: var(--logo-alignment);
         background-image: url(https://www.givingwhatwecan.org/email/gwwc_logo.png);
-<<<<<<< HEAD
-        background-size: contain;
-=======
         background-repeat: no-repeat !important;
         background-size: contain !important;
->>>>>>> 34dfb99 (Update GWWC image link)
       }
     </style>
     {% endif %}