resolve conflict

Author: Tahirih-Natang

infohub/settings.py

@@ -66,6 +66,10 @@
     'ckeditor',
 )
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> afe468f647de56831ae3f10a7ef971c6cdd8c0ad
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',

templates/firstaide/edit_post.html

@@ -53,7 +53,7 @@ <h2 class="text-center inverted-font">Edit Card</h2>
             </div>
         </div>
     </form>
-    <br>
+    <br/>
 </div>
 <br/>
 {% endblock %}

templates/malaria/edit_post.html

@@ -80,7 +80,6 @@ <h2 class="text-center">Edit Post</h2>
             </div>
         </div>
     </form>
-    <br>
 </div>
 <br><br><br>
 {% endblock %}