From c1fe26e9c3a1f6d26ff5b653150deacf56c45b7c Mon Sep 17 00:00:00 2001
From: Christian Franke <nobody@nowhere.ws>
Date: Fri, 3 Feb 2012 02:06:37 +0100
Subject: Revert "Merge branch 'master' of sublab.org:website"

This reverts commit 76f5eb72cda67da497ea4ba992778661559f26b4, reversing
changes made to 002ccb53e6319619d503972c2a6bad0d4ead0c6f.

Conflicts:

	template/topic/topic

Guys, please learn how to use git. Have a look at

    $ git diff origin/master master

and check if it looks reasonable. Also, if there is a merge in the
history, in our case, it is almost always bad. When you pull, use

    $ git pull --rebase --ff-only

and not just a pull without arguments.
---
 template/pages/projekte/content.html | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'template/pages/projekte/content.html')

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
-- 
cgit v1.2.1