From fc739761dc114b0127f1b8ac4c02f8cc9873d66f Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 10:39:53 +0200 Subject: [PATCH 1/7] Added a recommendation for Altstadt --- altstadt.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 altstadt.md diff --git a/altstadt.md b/altstadt.md new file mode 100644 index 0000000..49af671 --- /dev/null +++ b/altstadt.md @@ -0,0 +1,15 @@ + +# 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! -- GitLab From 0147697f7dea496924a6c7984c90d75a490eb7e3 Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 10:53:47 +0200 Subject: [PATCH 2/7] Fixed #1 --- 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..9b1d433 100644 --- a/branching-merging/recommendations.md +++ b/branching-merging/recommendations.md @@ -1,6 +1,6 @@ # Restaurant recommendations -A clection of recommended restarants in/near Heidelberg. +A collection of recommended restarants in/near Heidelberg. Click on the lins below to see recommendations for a particular area. @@ -12,4 +12,4 @@ Click on the lins below to see recommendations for a particular area. - Toby Hodges Contributions are encouraged! -Please read the instructions in [CONTRIBUTING.md](CONTRIBUTING.md) before submitting a Merge Request. \ No newline at end of file +Please read the instructions in [CONTRIBUTING.md](CONTRIBUTING.md) before submitting a Merge Request. -- GitLab From e7531c97843620adecd85dea8c19aa6a471af218 Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 11:36:34 +0200 Subject: [PATCH 3/7] Added link to Altstadt file --- branching-merging/altstadt.md | 15 +++++++++++++++ branching-merging/recommendations.md | 1 + 2 files changed, 16 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..49af671 --- /dev/null +++ b/branching-merging/altstadt.md @@ -0,0 +1,15 @@ + +# 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! diff --git a/branching-merging/recommendations.md b/branching-merging/recommendations.md index 9b1d433..1f12e31 100644 --- a/branching-merging/recommendations.md +++ b/branching-merging/recommendations.md @@ -6,6 +6,7 @@ Click on the lins below to see recommendations for a particular area. - [Rohrbach](rohrbach.md) - [Bergheim](bergheim.md) +- [Altstadt](altstadt.md) #### Contributors -- GitLab From 8639aa4590d6b048c48175635408e2661e349b91 Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 11:41:14 +0200 Subject: [PATCH 4/7] fixed typo and added URL --- branching-merging/altstadt.md | 1 + 1 file changed, 1 insertion(+) diff --git a/branching-merging/altstadt.md b/branching-merging/altstadt.md index 49af671..32f4f83 100644 --- a/branching-merging/altstadt.md +++ b/branching-merging/altstadt.md @@ -4,6 +4,7 @@ ### Soban Zwingerstr. 21, Heidleberg, BW 69117 +[Soban](https://www.facebook.com/pages/Soban-2/578112785591936) #### Pro -- GitLab From c4a6763b10639340c28bbf15de785fb263ba24b2 Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 12:06:49 +0200 Subject: [PATCH 5/7] Added barcelona.md --- branching-merging/barcelona.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 branching-merging/barcelona.md diff --git a/branching-merging/barcelona.md b/branching-merging/barcelona.md new file mode 100644 index 0000000..9f65d02 --- /dev/null +++ b/branching-merging/barcelona.md @@ -0,0 +1,15 @@ +# Barcelona + +### Cerveceria Catalana + +Carrer de Mallorca, 236, 08008, Barcelona +[Web (might be not official)](https://www.facebook.com/pages/category/Tapas-Bar---Restaurant/Cervecer%C3%ADa-Catalana-539478542770052/) + +#### Pro + +- good tapas. one of the best tapas bar in Barcelona + +#### Con + +- always busy +- not allowed to make a reservation - you have to go early -- GitLab From 480bff00e73a0c0407ff290ea619f1bb4a3bbcf0 Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 12:22:19 +0200 Subject: [PATCH 6/7] deleted an unwanted ./altstadt.md --- altstadt.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 altstadt.md diff --git a/altstadt.md b/altstadt.md deleted file mode 100644 index 49af671..0000000 --- a/altstadt.md +++ /dev/null @@ -1,15 +0,0 @@ - -# 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! -- GitLab From a6202f3a7f3a65e2b11506ddd70aee342ed8a562 Mon Sep 17 00:00:00 2001 From: fnakaki Date: Thu, 23 May 2019 12:26:26 +0200 Subject: [PATCH 7/7] corrected the link --- branching-merging/barcelona.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/branching-merging/barcelona.md b/branching-merging/barcelona.md index 9f65d02..d7cd1e2 100644 --- a/branching-merging/barcelona.md +++ b/branching-merging/barcelona.md @@ -3,11 +3,12 @@ ### Cerveceria Catalana Carrer de Mallorca, 236, 08008, Barcelona -[Web (might be not official)](https://www.facebook.com/pages/category/Tapas-Bar---Restaurant/Cervecer%C3%ADa-Catalana-539478542770052/) +[Web](https://www.facebook.com/pages/category/Tapas-Bar---Restaurant/Cervecer%C3%ADa-Catalana-539478542770052/) #### Pro - good tapas. one of the best tapas bar in Barcelona +- Not the cheapest option but reasonable prices #### Con -- GitLab