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

fix merge conflict

This commit is contained in:
Keviin Åberg Kultalahti 2021-05-05 18:42:50 +02:00
parent 335aeeded4
commit 22885f185a
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/src/pages/portal/_layout.svelte
View File

@ -1,9 +1,5 @@
<script> <script>
<<<<<<< HEAD
import { isActive, url, goto } from "@roxi/routify"
=======
import { isActive, url } from "@roxi/routify" import { isActive, url } from "@roxi/routify"
>>>>>>> next
import { onMount } from "svelte" import { onMount } from "svelte"
import { import {
Icon, Icon,