resolve merge conflict
This commit is contained in:
parent
f4413a8a74
commit
39857decda
1 changed files with 1 additions and 1 deletions
|
@ -742,7 +742,7 @@ const ControlsMixin = {
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
const builder = new L.U.FormBuilder(this, fields, {
|
const builder = new U.FormBuilder(this, fields, {
|
||||||
makeDirty: false,
|
makeDirty: false,
|
||||||
callback: filterFeatures,
|
callback: filterFeatures,
|
||||||
callbackContext: this,
|
callbackContext: this,
|
||||||
|
|
Loading…
Reference in a new issue