Resolve conflicts

This commit is contained in:
perryharlock
2013-11-11 15:05:43 +00:00
11 changed files with 63 additions and 13 deletions

View File

@@ -7,13 +7,13 @@
<div class="col-md-5 clearfix">
<ul class="crunch-bottom floated-list nav">
<li>
<a href="{{repo}}">github repo</a>
<a href="{{repo}}">GitHub Repo</a>
</li>
<li>
<a href="{{bugtracker}}">bug tracker</a>
<a href="{{bugtracker}}">Bug Tracker</a>
</li>
<li>
<a href="{{rules}}">list of rules</a>
<a href="http://www.w3.org/TR/WCAG20/">WCAG 2.0 spec</a>
</li>
</ul>
</div>