From f13b2255a4bf86eb4fa864d64a6ce1dcbbcade78 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Thu, 20 Oct 2022 11:24:23 +0200 Subject: [PATCH 1/2] Remove empty section --- day1/01_Introduction/05_Installation.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/day1/01_Introduction/05_Installation.md b/day1/01_Introduction/05_Installation.md index cb035a4..bd77769 100644 --- a/day1/01_Introduction/05_Installation.md +++ b/day1/01_Introduction/05_Installation.md @@ -176,9 +176,6 @@ The training notebooks come pre-provisioned with this `.bashrc` configuration: esac } -# set git colored prompt based on uid -myPrompt - ~~~ENDSECTION~~~ !SLIDE supplemental exercises From 5d2c5a365f968a447cea5eeb9fc6410952477dc7 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Thu, 20 Oct 2022 11:24:47 +0200 Subject: [PATCH 2/2] Remove leftover merge conflict text --- day2/02_Integrations/04_Hooks.md | 1 - 1 file changed, 1 deletion(-) diff --git a/day2/02_Integrations/04_Hooks.md b/day2/02_Integrations/04_Hooks.md index dd1fb44..752bcd5 100644 --- a/day2/02_Integrations/04_Hooks.md +++ b/day2/02_Integrations/04_Hooks.md @@ -43,7 +43,6 @@ https://docs.gitlab.com/ee/administration/server_hooks.html * Slack ~~~SECTION:handouts~~~ ->>>>>>> 3b648e1 (Rename master to main) ****