CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-04 03:54:37 +13:00
Code Issues Projects Releases Wiki Activity

missed conflict fix

Browse source
This commit is contained in:
Keviin Åberg Kultalahti 2021-02-12 14:32:46 +01:00
parent c81fb5e8be
commit 5afeb600a6
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
}) })