Merge fix
This commit is contained in:
parent
5b2f37e175
commit
3e19afd390
|
@ -22,11 +22,8 @@
|
||||||
export let rowCount
|
export let rowCount
|
||||||
export let disableSorting = false
|
export let disableSorting = false
|
||||||
export let customPlaceholder = false
|
export let customPlaceholder = false
|
||||||
<<<<<<< HEAD
|
|
||||||
export let allowEditing = true
|
export let allowEditing = true
|
||||||
=======
|
|
||||||
export let allowClickRows
|
export let allowClickRows
|
||||||
>>>>>>> origin/develop
|
|
||||||
|
|
||||||
const dispatch = createEventDispatcher()
|
const dispatch = createEventDispatcher()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue