From 51d25c1c9a5bfa11216b917f9720d63626c98a8c Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Fri, 24 May 2019 08:23:50 -0300
Subject: [PATCH] Work through merge conflict

---
 webapp/pages/profile/_id/_slug.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 7b9394897..6f042a4f7 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -344,10 +344,7 @@ export default {
     HcLoadMore,
     HcEmpty,
     ContentMenu,
-<<<<<<< HEAD
     HcUpload
-=======
->>>>>>> 9d1dfe6067280b792b752b46608e443aa3925616
   },
   transition: {
     name: 'slide-up',