From a3230799dd4e65fa96bab472cbf83c0efaeef11f Mon Sep 17 00:00:00 2001
From: Ricky Kenendy <13516105@std.stei.itb.ac.id>
Date: Sun, 14 Apr 2019 19:47:11 +0700
Subject: [PATCH] fix bug on header comment component

---
 src/components/partials/Comments.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/partials/Comments.vue b/src/components/partials/Comments.vue
index 854dedc..e42103c 100644
--- a/src/components/partials/Comments.vue
+++ b/src/components/partials/Comments.vue
@@ -1,10 +1,6 @@
 <template>
-<<<<<<< HEAD
   <div id="placeholder">
     <h4 class="font-weight-bold">Komentar ({{rows}})</h4>
-=======
-  <div id="comments-placeholder">
->>>>>>> 8b073dd0b310f4ac1bcf4d8a7bdf1fc0952755b4
     <div id="comments-container">
       <b-card
         bg-variant="light"
-- 
GitLab