summaryrefslogtreecommitdiff
path: root/template/pages/projekte/content.html
diff options
context:
space:
mode:
Diffstat (limited to 'template/pages/projekte/content.html')
-rw-r--r--template/pages/projekte/content.html19
1 files changed, 0 insertions, 19 deletions
diff --git a/template/pages/projekte/content.html b/template/pages/projekte/content.html
index d7bd8dc..6d15c65 100644
--- a/template/pages/projekte/content.html
+++ b/template/pages/projekte/content.html
@@ -8,19 +8,6 @@
<h3>
Aeroponie
</h3>
-<<<<<<< HEAD
-<!--<div class="imagecontent">
- <a href="img/lounge.jpg" class="img"><img class="contentimage" src="img/lounge_klein.jpg" alt="Die Bar"></a>
- <p class="subtext">
- Die Bar
- </p>
-</div>-->
-<p>
- Beschreibung
-</p>
-<h3>
- SFP
-=======
<div class="imagecontent">
<a href="img/aeroponie.jpg" class="img"><img class="contentimage" src="img/aeroponie_klein.jpg" alt="Aeroponiesystem"></a>
<p class="subtext">
@@ -33,7 +20,6 @@
</p>
<h3>
Hackstatt
->>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f
</h3>
<!--<div class="imagecontent">
<a href="img/werkstatt.jpg" class="img"><img class="contentimage" src="img/werkstatt_klein.jpg" alt="Werkstatt"></a>
@@ -42,10 +28,6 @@
</p>
</div>-->
<p>
-<<<<<<< HEAD
- Beschreibung
-</p
-=======
In Leipzig gibt es gerade die Bestrebung ein Fablab aufzubauen.<br>
<a href="http://hackstatt.org">Mehr zur Hackstatt</a>
</p>
@@ -84,4 +66,3 @@
<!-- <a href="/sfp">Mehr zum SFP-Adapterprojekt</a>-->
</p>
->>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f