From a7a4307fb08d59504cac8ecb593cb529d1957a75 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Tue, 1 Aug 2017 17:54:02 -0300
Subject: [PATCH] Adjusting template inconsistence

---
 bulletin/templates/bulletin/view.html | 6 ------
 1 file changed, 0 insertions(+), 6 deletions(-)

diff --git a/bulletin/templates/bulletin/view.html b/bulletin/templates/bulletin/view.html
index cbda33c..657a5be 100644
--- a/bulletin/templates/bulletin/view.html
+++ b/bulletin/templates/bulletin/view.html
@@ -57,10 +57,6 @@
                 <hr />
 
                 <div class="row">
-<<<<<<< HEAD
-                    <div class="col-md-8 col-md-offset-2 col-sm-8 col-sm-offset-2 alert-warning bulletin-warning">
-                        <div class="col-md-2 col-sm-2">
-=======
                   <div class="col-md-12">
                       <b><h5>    {% trans "Check your goals" %}:</b></h5>
                             <table class="table table-bordered">
@@ -91,12 +87,10 @@
                             </table>
                           </div>
                     </div>
-                </div>
 
                 <div class="row">
                     <div class="col-md-8 col-md-offset-2 alert-warning bulletin-warning">
                         <div class="col-md-2">
->>>>>>> cba88b9cfc2d1ed7f6ebb2af37b204fb9e96f113
                             <img src="{% static 'img/warning.png' %}" class="img-responsive" />
                         </div>
                         <div class="col-md-10 col-sm-10">
--
libgit2 0.21.2