From: zoe1 <zoe@fsf.org>
Date: Mon, 1 Mar 2021 16:06:54 +0000 (+0100)
Subject: text conflict erased
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=222985a52aa31cb1ccdc4c973f8eb54ebd95ab91;p=libreplanet-static.git

text conflict erased
---

diff --git a/2021/sponsors/index.html b/2021/sponsors/index.html
index 5c05facb..8e0097cc 100755
--- a/2021/sponsors/index.html
+++ b/2021/sponsors/index.html
@@ -111,11 +111,8 @@
 
 <p>To inquire about sponsoring the event, or if you have any questions, please email <a href="mailto:campaigns@fsf.org">campaigns@fsf.org.</a></p>
 
-<<<<<<< HEAD
 <!--<p><a href="Sponsoring2020.pdf"><img src="https://static.fsf.org/nosvn/libreplanet/2020/assets/Sponsoring2020.jpg" width="40%" align="right" hspace="20" vspace="20"></a></p>-->
-=======
-<p><a href="Sponsoring2021.pdf"><img src="https://static.fsf.org/nosvn/libreplanet/2021/assets/Sponsoring2021.jpg" width="40%" align="right" hspace="20" vspace="20"></a></p>
->>>>>>> master
+
 
 </br>