Fix merge conflict

centre-for-effective-altruism · Mar 7, 2024 · d43f6db · d43f6db
1 parent f75a05c
commit d43f6db
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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 %}