From b948234aec2ec1d140a46303c09d24424262bd66 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 26 Nov 2018 04:44:54 +0300
Subject: whoops

---
 src/main.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index 5f459d46..9f094ada 100644
--- a/src/main.js
+++ b/src/main.js
@@ -43,7 +43,6 @@ const i18n = new VueI18n({
   messages
 })
 
-=======
 const persistedStateOptions = {
   paths: [
     'config',
@@ -67,7 +66,6 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
     plugins: [persistedState],
     strict: false // Socket modifies itself, let's ignore this for now.
     // strict: process.env.NODE_ENV !== 'production'
->>>>>>> upstream/develop
   })
 
   afterStoreSetup({store, i18n})
-- 
cgit v1.2.3-70-g09d2