From 7c58fa31b245a4de3219fb1102ea475b5d77c88e Mon Sep 17 00:00:00 2001
From: czmj <clarazmjordan@gmail.com>
Date: Fri, 29 Sep 2017 15:32:51 +0100
Subject: [PATCH] oops...actually commit merge

---
 src/_includes/cta.html | 4 ----
 src/contact.md         | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/_includes/cta.html b/src/_includes/cta.html
index 5d2daa0..3955d3a 100644
--- 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>
diff --git a/src/contact.md b/src/contact.md
index 141ff29..5877e74 100644
--- a/src/contact.md
+++ b/src/contact.md
@@ -7,11 +7,7 @@ title: Contact
 
 [autonomic@posteo.net](mailto:autonomic@posteo.net)
 
-<<<<<<< HEAD
-[Download PGP Key]({https://autonomic-cooperative.gitlab.io}{% link assets/pgp/autonomic-key.asc %}) 
-=======
 [Download PGP Key]({{ "/assets/pgp/autonomic-key.asc" | relative_url }})
->>>>>>> bd276de689d553c02c023c50164b6fc165242ec8
 
 Fingerprint: 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147