From 44bf55943f694c93a8c270700486b1a9cf22ac8c Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sat, 19 Sep 2015 08:25:34 -0600
Subject: [PATCH] removed conflict on digitalglarus/contact.html

---
 digitalglarus/templates/digitalglarus/contact.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/digitalglarus/templates/digitalglarus/contact.html b/digitalglarus/templates/digitalglarus/contact.html
index 919ba0a0..75c0d906 100755
--- a/digitalglarus/templates/digitalglarus/contact.html
+++ b/digitalglarus/templates/digitalglarus/contact.html
@@ -21,13 +21,7 @@
                         <strong>+41 (0) 44 534 66 22</strong>
                     </p>
                     <p>Email:
-<<<<<<< HEAD
                         <strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong>
-||||||| merged common ancestors
-                        <strong><a href="mailto:digital.glarus@ungleich.ch">digital.glarus@ungleich.ch</a></strong>
-=======
-                        <strong><a href="mailto:join@digitalglarus.ch">join@digitalglarus.ch</a></strong>
->>>>>>> 23bc25b6ee56d94ac519920513a8766dbb9a9ff4
                     </p>
                     <p>Address:
                       <strong>Hauptstrasse 14, 8775 Luchsingen<br>