Browse Source

fix merge conflict

master
Keviin Åberg Kultalahti 5 years ago
parent
commit
d960dfbbbd
  1. 4
      packages/builder/src/pages/portal/_layout.svelte

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

@ -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,

Loading…
Cancel
Save