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

Remove merge conflicts

This commit is contained in:
Adria Navarro 2024-12-30 22:57:36 +01:00
parent 6777cd2871
commit a83ae43da7
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/stores/builder/tests/sortedIntegrations.test.ts
View File

@ -1,12 +1,7 @@
import { it, expect, describe, beforeEach, vi } from "vitest"
<<<<<<< HEAD
import { SortedIntegrationStore } from "@/stores/builder/sortedIntegrations"
import { DatasourceTypes } from "@/constants/backend"
=======
import { DatasourceTypes } from "@/constants/backend"
import { SortedIntegrationStore } from "@/stores/builder/sortedIntegrations"
>>>>>>> 094e337f0288652e71c7bebd1ed32003f62af90a
import { derived } from "svelte/store"
import { integrations } from "@/stores/builder/integrations"