chore: resolve conflicts

This commit is contained in:
Yurii
2025-03-06 04:50:02 +03:00
parent ee868b22ce
commit 72235286c0

View File

@@ -871,6 +871,10 @@ function dec2hex(i) {
return hex.toUpperCase();
}
function constrain(amt, low, high) {
return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
}
function c2f(value) {
return (9 / 5) * value + 32;
}
@@ -878,7 +882,3 @@ function c2f(value) {
function f2c(value) {
return (value - 32) * (5 / 9);
}
function constrain(amt, low, high) {
return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
}