Fixed merge conflict

2 years ago · ef03f1a7d4
2 changed files with 2 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20220909180703",
+  "version": "2.0.20220913131735",
  "description": "fineui",
  "main": "dist/fineui_without_conflict.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/case/trigger/trigger.text.select.js
+++ b/src/case/trigger/trigger.text.select.js
@ -52,7 +52,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
    _digest: function (val, items) {
        var o = this.options;
-        
+
        //  提升valueFormatter的优先级
        if (o.valueFormatter !== BI.emptyFn && BI.isFunction(o.valueFormatter)) {
            return {