Removed conflict header from git conflicts

2025-10-27 08:01:24 -05:00 · 2025-10-27 08:01:24 -05:00 · 4f9ce8173e
parent 17a0a62ed2
commit 4f9ce8173e
1 changed files with 1 additions and 1 deletions
--- 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;
                }