From 4f9ce8173e53cbdce75356283b6e669af6fc9496 Mon Sep 17 00:00:00 2001
From: Alexthetransfem <124483815+theenchantedsword@users.noreply.github.com>
Date: Mon, 27 Oct 2025 08:01:24 -0500
Subject: [PATCH] Removed conflict header from git conflicts

---
 mods/solubility.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods/solubility.js b/mods/solubility.js
index 95aefb36..64400bad 100644
--- a/mods/solubility.js
+++ b/mods/solubility.js
@@ -54,7 +54,7 @@ dependOn("orchidslibrary.js", ()=>{
                 }
                 if(r.tempMax && !((p1.temp <= r.tempMax) && (p2.temp <= r.tempMax))){
                     return false;
-          <<<<<<<<<      }
+			    }
                 if(r.charged && !(p1.charge || p2.charge)){
                     return false;
                 }