From baeb1add19535e376ea2c29acc77a15823e95231 Mon Sep 17 00:00:00 2001
From: Summer <summerlizebeth@protonmail.com>
Date: Mon, 19 Jul 2021 15:05:43 -0400
Subject: [PATCH] Jesus christ I hate git

---
 services/m=news/archives/latest.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/services/m=news/archives/latest.html b/services/m=news/archives/latest.html
index 1bf0e837d..1c634045a 100644
--- a/services/m=news/archives/latest.html
+++ b/services/m=news/archives/latest.html
@@ -210,11 +210,7 @@ $("#play, #playExisting, #playBannerNoad").each(function(){ this.href += "?j=1";
 
     <b><u>Bug Fixes</u></b>
         <ul>
-<<<<<<< HEAD
-          <li>Explorer ring 3 is now obtainable</li>
-=======
-            <li>Exporer's ring 3 is once again obtainable.</li>
->>>>>>> fd506095de66cefd7d4ead132a5170da83682679
+           <li>Explorer ring 3 is now obtainable</li>
             <li>Fixed the Fruit Trees.</li>
             <li>Fixed Wildblood seeds</li>
             <li>Avantoe patches no longer turn into weeds.</li>