From d960dfbbbdf3e9458dc4a354effa0b57a7b62a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= <kevin.aberg@gmail.com>
Date: Wed, 5 May 2021 18:42:50 +0200
Subject: [PATCH] fix merge conflict

---
 packages/builder/src/pages/portal/_layout.svelte | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte
index b92febbb4..e26148b66 100644
--- 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,