From 8617df285fc0f08f487aeeda7fbf9f63de54355a Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Wed, 12 Sep 2018 15:47:34 +0800
Subject: [PATCH] fixMergeConflicts2

---
 resources/assets/js/pages/admin/home.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 491bc3c3..3068a292 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -291,8 +291,4 @@ export default {
   }
 
 }
-<<<<<<< HEAD
 </script>
-=======
-</script>
->>>>>>> 9aaafd24d6527f6f6e60dfeaf2846fbc42363eed