app/views/groups/issues.html.haml

aa562eaa · Constance Okoghenun · 1d3fc67b · aa562eaa
Commit aa562eaa authored Feb 22, 2018 by Constance Okoghenun
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/views/groups/issues.html.haml app/views/groups/issues.html.haml +0 -3

No files found.
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -5,10 +5,7 @@
 - content_for :page_specific_javascripts do
  = webpack_bundle_tag 'common_vue'
-<<<<<<< HEAD
  = webpack_bundle_tag 'issues'
-=======
->>>>>>> upstream/master
 - if group_issues_exists
  .top-area