From 278376cfc60c3e0aff7b98271ae55090033b7a6e Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Mon, 22 Feb 2016 10:11:02 -0300
Subject: [PATCH] fix merge error in management

---
 app/views/management/complaints/index.html.erb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/views/management/complaints/index.html.erb b/app/views/management/complaints/index.html.erb
index c82e7ee99..c7cbec1e8 100644
--- a/app/views/management/complaints/index.html.erb
+++ b/app/views/management/complaints/index.html.erb
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
 <h1 class="ls-title-intro ls-ico-bullhorn">Denúncias</h1>
-=======
-
-
-<h1 class="ls-title-intro ls-ico-stats">Denúncias</h1>
->>>>>>> fix-management-merge
 
 <div class="ls-box-filter">
 
@@ -33,8 +27,6 @@
 
 </div>
 
-
-
 <h2 class="ls-title-4">Relatório de Denúncias</h2>
 
 <div class="row">
-- 
GitLab