From 13df4b03097b7b9a385ee827bd62775e4f127646 Mon Sep 17 00:00:00 2001 From: Wasiu Akanni Date: Thu, 23 May 2019 10:46:18 +0200 Subject: [PATCH 1/6] recommendation for altstadt --- branching-merging/altstadt.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 branching-merging/altstadt.md diff --git a/branching-merging/altstadt.md b/branching-merging/altstadt.md new file mode 100644 index 0000000..e455cf5 --- /dev/null +++ b/branching-merging/altstadt.md @@ -0,0 +1,14 @@ +# Altstadt + +### Soban + +Zwingerstr. 21, Heidleberg, BW 69117 + +#### Pro + +- good, spicy Korean food + +#### Con + +- not many vegetarian/vegan options +- quite small - best to make a reservation! \ No newline at end of file -- GitLab From 2502c7323ac6b118f1f6091b85ccfa7b1027731f Mon Sep 17 00:00:00 2001 From: Wasiu Akanni Date: Thu, 23 May 2019 10:53:44 +0200 Subject: [PATCH 2/6] recommendations typos fixed --- branching-merging/recommendations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branching-merging/recommendations.md b/branching-merging/recommendations.md index c3f0478..7f8c18e 100644 --- a/branching-merging/recommendations.md +++ b/branching-merging/recommendations.md @@ -1,8 +1,8 @@ # Restaurant recommendations -A clection of recommended restarants in/near Heidelberg. +A collection of recommended restaurants in/near Heidelberg. -Click on the lins below to see recommendations for a particular area. +Click on the lines below to see recommendations for a particular area. - [Rohrbach](rohrbach.md) - [Bergheim](bergheim.md) -- GitLab From d3d6ec74740d4d7c61fd354e855a8b4da83a8c2f Mon Sep 17 00:00:00 2001 From: Wasiu Akanni Date: Thu, 23 May 2019 11:34:50 +0200 Subject: [PATCH 3/6] added altstadt to the list of recommendations 2222 --- branching-merging/recommendations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/branching-merging/recommendations.md b/branching-merging/recommendations.md index 7f8c18e..44c8df7 100644 --- a/branching-merging/recommendations.md +++ b/branching-merging/recommendations.md @@ -6,6 +6,7 @@ Click on the lines below to see recommendations for a particular area. - [Rohrbach](rohrbach.md) - [Bergheim](bergheim.md) +- [Altstadt](altstadt.md) #### Contributors -- GitLab From a060cb8c7b4517a9fb3dfc4388951b4bfc198900 Mon Sep 17 00:00:00 2001 From: Wasiu Akanni Date: Thu, 23 May 2019 11:39:56 +0200 Subject: [PATCH 4/6] added a new url --- branching-merging/altstadt.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/branching-merging/altstadt.md b/branching-merging/altstadt.md index e455cf5..632ab01 100644 --- a/branching-merging/altstadt.md +++ b/branching-merging/altstadt.md @@ -2,7 +2,9 @@ ### Soban -Zwingerstr. 21, Heidleberg, BW 69117 +Zwingerstr. 21, Heidelberg, BW 69117 + +https://soban.de #### Pro -- GitLab From f7bbbb5136408dbcecd4c594576b4f47aa669010 Mon Sep 17 00:00:00 2001 From: Wasiu Akanni Date: Thu, 23 May 2019 12:03:26 +0200 Subject: [PATCH 5/6] fixed merge issues from afrojuju remote --- branching-merging/altstadt.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/branching-merging/altstadt.md b/branching-merging/altstadt.md index d3d2dbd..4056c0f 100644 --- a/branching-merging/altstadt.md +++ b/branching-merging/altstadt.md @@ -12,9 +12,5 @@ https://www.restaurant-soban.de/speisekarte/ #### Con -- not many vegetarian/vegan options -<<<<<<< HEAD - quite small - best to make a reservation! -======= -- quite small - best to make a reservation! ->>>>>>> a8125b14913306295a16304adf58b9dd83d1abc6 + -- GitLab From 971f94af8b0af600e50ce2439c5a1d726852dde4 Mon Sep 17 00:00:00 2001 From: Wasiu Akanni Date: Thu, 23 May 2019 12:05:45 +0200 Subject: [PATCH 6/6] fixed #4 added a restaurant --- branching-merging/neuenheim.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 branching-merging/neuenheim.md diff --git a/branching-merging/neuenheim.md b/branching-merging/neuenheim.md new file mode 100644 index 0000000..ed1d0a6 --- /dev/null +++ b/branching-merging/neuenheim.md @@ -0,0 +1,16 @@ +# Neuenheim + +### Die Kurfürstenstube + +Friedrich-Ebert-Anlage 1, 69117 Heidelberg + +http://www.kurfuerstenstube.de/ + +#### Pro + +- michellin star, so should be good quality + +#### Con + +- expensive + -- GitLab