From 9c3bde0f7e1c18db818cf5ff606b87b7354593e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= <kevin.aberg@gmail.com>
Date: Fri, 12 Feb 2021 14:32:46 +0100
Subject: [PATCH] missed conflict fix

---
 .../backend/DataTable/modals/CreateEditColumn.svelte           | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 851b9e832c..3e08096152 100644
--- 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
     })