summaryrefslogtreecommitdiff
path: root/template/pages/projekte
diff options
context:
space:
mode:
Diffstat (limited to 'template/pages/projekte')
-rw-r--r--template/pages/projekte/content.html19
1 files changed, 19 insertions, 0 deletions
diff --git a/template/pages/projekte/content.html b/template/pages/projekte/content.html
index 6d15c65..d7bd8dc 100644
--- a/template/pages/projekte/content.html
+++ b/template/pages/projekte/content.html
@@ -8,6 +8,19 @@
<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">
@@ -20,6 +33,7 @@
</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>
@@ -28,6 +42,10 @@
</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>
@@ -66,3 +84,4 @@
<!-- <a href="/sfp">Mehr zum SFP-Adapterprojekt</a>-->
</p>
+>>>>>>> 002ccb53e6319619d503972c2a6bad0d4ead0c6f