fix merge conflict

2021-05-05 18:42:50 +02:00 · 2021-05-05 18:42:50 +02:00 · d960dfbbbd
parent 13468a5a3f
commit d960dfbbbd
1 changed files with 0 additions and 4 deletions
--- a/packages/builder/src/pages/portal/_layout.svelte
+++ b/packages/builder/src/pages/portal/_layout.svelte
@ -1,9 +1,5 @@
 <script>
-<<<<<<< HEAD
-  import { isActive, url, goto } from "@roxi/routify"
-=======
  import { isActive, url } from "@roxi/routify"
->>>>>>> next
  import { onMount } from "svelte"
  import {
    Icon,