text conflict erased

diff --git a/2021/sponsors/index.html b/2021/sponsors/index.html
index 5c05facb7c3ca4d3a6fe85546448fd019ab254d7..8e0097cc5e0a4a2a41db0f3332b507916f24b0db 100755 (executable)
--- 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>