MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missed conflict fix

This commit is contained in:
Keviin Åberg Kultalahti 2021-02-12 14:32:46 +01:00
parent 7cb263ceff
commit 9c3bde0f7e
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -51,11 +51,8 @@
originalName, originalName,
field, field,
primaryDisplay, primaryDisplay,
<<<<<<< HEAD
oneToMany, oneToMany,
=======
indexes, indexes,
>>>>>>> develop
}) })
return state return state
}) })