Commit 00818122 authored by Ben Waters's avatar Ben Waters

fix merge

parent 10ad0c6e
......@@ -24,10 +24,6 @@ YourSchool Advisor
<div class="col-md-offset-3 col-md-6">
<a href="{% url 'new-trac' %}">
<button type="button" class="btn btn-standard btn-lg btn-block">Create a new Trajectory</button>
=======
<a href="#new">
<button type="button" class="btn btn-primary btn-lg btn-block">Create a new Trajectory</button>
>>>>>>> b118a28f2aa9c22c1957ac03dd7f0badbc5864d6
</a>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment