Jesus christ I hate git

This commit is contained in:
Summer 2021-07-19 15:05:43 -04:00
parent 390cba9dd6
commit baeb1add19

View File

@ -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>