oops...actually commit merge

2017-09-29 15:32:51 +01:00
parent 67af81639e
commit 7c58fa31b2
2 changed files with 0 additions and 8 deletions
--- a/src/_includes/cta.html
+++ b/src/_includes/cta.html
@ -6,11 +6,7 @@
      <p>Contact us to discuss your project's needs and arrange a consultation.</p>
    </header>
    <ul class="actions vertical">
-<<<<<<< HEAD
-      <li><a href="/contact" class="button fit special">Contact</a></li>
-=======
      <li><a href="{{ "/contact" | relative_url }}" class="button fit special">Contact</a></li>
->>>>>>> bd276de689d553c02c023c50164b6fc165242ec8
    </ul>
  </div>
 </section>