commodore
/
sandboxels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed conflict header from git conflicts

This commit is contained in:
Alexthetransfem 2025-10-27 08:01:24 -05:00 committed by GitHub
parent 17a0a62ed2
commit 4f9ce8173e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/solubility.js
View File

@ -54,7 +54,7 @@ dependOn("orchidslibrary.js", ()=>{
} }
if(r.tempMax && !((p1.temp <= r.tempMax) && (p2.temp <= r.tempMax))){ if(r.tempMax && !((p1.temp <= r.tempMax) && (p2.temp <= r.tempMax))){
return false; return false;
<<<<<<<<< } }
if(r.charged && !(p1.charge || p2.charge)){ if(r.charged && !(p1.charge || p2.charge)){
return false; return false;
} }