From 300d9f0991a95f7aa179f281eee5e84b738b66a3 Mon Sep 17 00:00:00 2001 From: julianvantienhoven-nhs <106071366+julianvantienhoven-nhs@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:49:22 +0100 Subject: [PATCH 1/7] Create config.txt --- config.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 config.txt diff --git a/config.txt b/config.txt new file mode 100644 index 00000000..1312fb01 --- /dev/null +++ b/config.txt @@ -0,0 +1 @@ +Some cnfigsettings in remote From 5315d65cae023bada2b4bb7b4c0066bf13ca80c9 Mon Sep 17 00:00:00 2001 From: julian vantienhoven Date: Wed, 19 Jun 2024 13:01:17 +0100 Subject: [PATCH 2/7] Added to config.txt --- config.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config.txt b/config.txt index 1312fb01..6dd967af 100644 --- a/config.txt +++ b/config.txt @@ -1 +1,2 @@ Some cnfigsettings in remote +And a new feature from local \ No newline at end of file From 94e0a23e742c8f543ee56b77fc4b3d5920a83ab9 Mon Sep 17 00:00:00 2001 From: julianvantienhoven-nhs <106071366+julianvantienhoven-nhs@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:04:39 +0100 Subject: [PATCH 3/7] Create feature3.txt --- feature3/feature3.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature3/feature3.txt diff --git a/feature3/feature3.txt b/feature3/feature3.txt new file mode 100644 index 00000000..75eae95c --- /dev/null +++ b/feature3/feature3.txt @@ -0,0 +1 @@ +A feature 3 file From e4b238ed2c338d2025dd0021cca4dc3c6457e519 Mon Sep 17 00:00:00 2001 From: julian vantienhoven Date: Wed, 19 Jun 2024 13:07:36 +0100 Subject: [PATCH 4/7] more config changes --- config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.txt b/config.txt index 6dd967af..978751ce 100644 --- a/config.txt +++ b/config.txt @@ -1,2 +1,3 @@ Some cnfigsettings in remote -And a new feature from local \ No newline at end of file +And a new feature from local +Another option \ No newline at end of file From 4bacce772b03f603159a5268e18cea68902c321f Mon Sep 17 00:00:00 2001 From: julian vantienhoven Date: Wed, 19 Jun 2024 14:00:41 +0100 Subject: [PATCH 5/7] add feature4 --- feature4/feature4.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature4/feature4.txt diff --git a/feature4/feature4.txt b/feature4/feature4.txt new file mode 100644 index 00000000..13a3adda --- /dev/null +++ b/feature4/feature4.txt @@ -0,0 +1 @@ +A new feature \ No newline at end of file From 2e609230cc01c8ef9ab46a6593576f71372d1228 Mon Sep 17 00:00:00 2001 From: julian vantienhoven Date: Wed, 19 Jun 2024 14:13:09 +0100 Subject: [PATCH 6/7] First commit for utility --- utility/config.txt | 3 +++ utility/feature.txt | 2 ++ utility/utility.txt | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 utility/config.txt create mode 100644 utility/feature.txt create mode 100644 utility/utility.txt diff --git a/utility/config.txt b/utility/config.txt new file mode 100644 index 00000000..ef34d7b2 --- /dev/null +++ b/utility/config.txt @@ -0,0 +1,3 @@ +config setting 1 +config setting 2 +config setting 3 diff --git a/utility/feature.txt b/utility/feature.txt new file mode 100644 index 00000000..78f7a8c9 --- /dev/null +++ b/utility/feature.txt @@ -0,0 +1,2 @@ +feature 1 +featire 2 \ No newline at end of file diff --git a/utility/utility.txt b/utility/utility.txt new file mode 100644 index 00000000..730a5d48 --- /dev/null +++ b/utility/utility.txt @@ -0,0 +1,2 @@ +util1 +util2 \ No newline at end of file From a3297bf4c4b1c227cdfa0f24eda3258c89163302 Mon Sep 17 00:00:00 2001 From: julian vantienhoven Date: Wed, 19 Jun 2024 14:31:27 +0100 Subject: [PATCH 7/7] Made changes after Review --- utility/utility.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utility/utility.txt b/utility/utility.txt index 730a5d48..c4eca98e 100644 --- a/utility/utility.txt +++ b/utility/utility.txt @@ -1,2 +1,3 @@ util1 -util2 \ No newline at end of file +util2 +util 3 \ No newline at end of file