Download as
Browse Code »

Commit a7a4307fb08d59504cac8ecb593cb529d1957a75

Authored by Zambom
1 parent d9e52ea2
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting template inconsistence

Showing 1 changed file with 0 additions and 6 deletions   Show diff stats
bulletin/templates/bulletin/view.html
  Diff comments   View file @a7a4307
... ... @@ -57,10 +57,6 @@
57 57 <hr />
58 58  
59 59 <div class="row">
60   -<<<<<<< HEAD
61   - <div class="col-md-8 col-md-offset-2 col-sm-8 col-sm-offset-2 alert-warning bulletin-warning">
62   - <div class="col-md-2 col-sm-2">
63   -=======
64 60 <div class="col-md-12">
65 61 <b><h5> {% trans "Check your goals" %}:</b></h5>
66 62 <table class="table table-bordered">
... ... @@ -91,12 +87,10 @@
91 87 </table>
92 88 </div>
93 89 </div>
94   - </div>
95 90  
96 91 <div class="row">
97 92 <div class="col-md-8 col-md-offset-2 alert-warning bulletin-warning">
98 93 <div class="col-md-2">
99   ->>>>>>> cba88b9cfc2d1ed7f6ebb2af37b204fb9e96f113
100 94 <img src="{% static 'img/warning.png' %}" class="img-responsive" />
101 95 </div>
102 96 <div class="col-md-10 col-sm-10">
... ...