missed conflict fix

6 years ago · 9c3bde0f7e
1 changed files with 0 additions and 3 deletions
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@ -51,11 +51,8 @@
        originalName,
        field,
        primaryDisplay,
-<<<<<<< HEAD
        oneToMany,
-=======
        indexes,
->>>>>>> develop
      })
      return state
    })