Skip to content

Commit

Permalink
fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mmmavis committed Jan 24, 2018
1 parent 2e24e4f commit 2bc979a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion network-api/networkapi/fellows/templates/fellows_home.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1 class="h1-white">Fellowships</h1>

{% block body %}
<div class="row mb-5">
<div class="col-md-12 mb-5">
<div class="col-md-12 my-5">
<hr class="hr-gradient mt-0">
<h4 class="h2-headings-white">What are Fellowships?</h4>
</div>
Expand Down

0 comments on commit 2bc979a

Please sign in to comment.