Merge branch 'master' of gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io

2017-09-29 15:30:51 +01:00
parent 0f70f40a73 bd276de689
commit 67af81639e
2 changed files with 8 additions and 0 deletions
--- a/src/_includes/cta.html
+++ b/src/_includes/cta.html
@ -6,7 +6,11 @@
      <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>