mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed conflict on digitalglarus/contact.html

Browse source
This commit is contained in:
rascencio 2015-09-19 08:25:34 -06:00
parent c0933f4de2
commit 44bf55943f
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
digitalglarus/templates/digitalglarus/contact.html
View file

@ -21,13 +21,7 @@
<strong>+41 (0) 44 534 66 22</strong> <strong>+41 (0) 44 534 66 22</strong>
</p> </p>
<p>Email: <p>Email:
<<<<<<< HEAD
<strong><a href="mailto:digitalglarus@ungleich.ch">digitalglarus@ungleich.ch</a></strong> <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>
<p>Address: <p>Address:
<strong>Hauptstrasse 14, 8775 Luchsingen<br> <strong>Hauptstrasse 14, 8775 Luchsingen<br>