manual merge from kriesse

gsambrotta · Nov 3, 2012 · f6a8aae · f6a8aae
2 parents 7490607 + d7018eb
commit f6a8aae
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -18,5 +18,3 @@ for you, Steven doesn't accept pull requests from just anyone. He'll
 only take pull requests from his lieutenants, the class coaches.
 
 So find your coach!
-
----- tanja approves
diff --git a/cafes/README.md b/cafes/README.md
@@ -2,4 +2,3 @@ Oh coffee, you complete me.
 
 List your favourite little cafes here. One file per cafe please!
 
-tanja was here
diff --git a/cafes/cafe_central.md b/cafes/cafe_central.md
diff --git a/restaurants/README.md b/restaurants/README.md
@@ -1,5 +1,3 @@
 Looking for the perfect frühstück? Perhaps a good steak or delicious
 falafel? Add your favourite restaurants here! Just create a new file
 in this directory for each of your favourites.
-
-YES
diff --git a/restaurants/coco.md b/restaurants/coco.md
@@ -0,0 +1,6 @@
+# Cô Cô
+
+Rosenthalerstr. 2
+10119 Berlin
+
+Really awesome vietnamese style sandwiches, soups, noodle stuff with salad, banana cake, sweet corn deserts and more. It's incredible tasty and they have vegetarian/vegan choices, too. You DON'T want to miss this!
diff --git a/restaurants/nil.md b/restaurants/nil.md
@@ -1,6 +1,6 @@
 # Nil
 
-Grunberger Strasse 52
+Gruenberger Strasse 52
 
 Sudanese food to die for. I recommend the Haloumi Tamiya (falafel). So
 good!!!
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,5 +18,3 @@ for you, Steven doesn't accept pull requests from just anyone. He'll
		only take pull requests from his lieutenants, the class coaches.

		So find your coach!

		---- tanja approves
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@ Oh coffee, you complete me.

		List your favourite little cafes here. One file per cafe please!

		tanja was here