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

remove merge conflict

This commit is contained in:
Martin McKeaveney 2021-04-12 20:11:21 +01:00
parent b5baf9f892
commit 20a00d1225
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
View File

@ -1,11 +1,6 @@
<script> <script>
<<<<<<< HEAD
import { backendUiStore } from "builderStore"
import { Select, Label } from "@budibase/bbui"
=======
import { tables } from "stores/backend" import { tables } from "stores/backend"
import { Select } from "@budibase/bbui" import { Select } from "@budibase/bbui"
>>>>>>> 46acb096005b6b0fb2f20ad3618c2ac9a23f639c
import DrawerBindableInput from "../../common/DrawerBindableInput.svelte" import DrawerBindableInput from "../../common/DrawerBindableInput.svelte"
import AutomationBindingPanel from "./AutomationBindingPanel.svelte" import AutomationBindingPanel from "./AutomationBindingPanel.svelte"