Resolving merge conflict

LaunchCode-Education-Archived · Sep 13, 2022 · 7cdd8d1 · 7cdd8d1
2 parents 2e200b1 + fb06626
commit 7cdd8d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/_templates/layout.html b/src/_templates/layout.html
@@ -106,7 +106,7 @@ <h1>{{ project }}</h1>
 <div class="container">
   <div class="row">
     {%- block sidebar1 %}{{ bsidebar() }}{% endblock %}
-    <div class="{{ bs_span_prefix }}{{ bs_content_width }} col-md-offset-1 content ">
+    <div class="{{ bs_span_prefix }}{{ bs_content_width }} col-md-offset-1 content " role="main">
 
     {% block body %}{% endblock %}
 
@@ -155,4 +155,4 @@ <h1>{{ project }}</h1>
     </p>
   </div>
 </footer>
-{%- endblock %}
+{%- endblock %}