fix merge conflicts

2026-09-26 18:31:11 +00:00 · 2026-07-15 21:04:42 +08:00
parent 71d0380467 62afea225a
commit cd8c42b125
1025 changed files with 214936 additions and 22047 deletions
@@ -941,6 +941,7 @@ bool TextCtrl::value_was_changed()
    case coString:
    case coStrings:
    case coFloatOrPercent:
+    case coFloatsOrPercents:
        return boost::any_cast<std::string>(m_value) != boost::any_cast<std::string>(val);
    default:
        return true;