From 9bbdf27c44dd7b8afd4200c3493a3531004b1ad2 Mon Sep 17 00:00:00 2001 From: Willy Woitas Date: Mon, 22 Jan 2018 16:36:32 +0100 Subject: [PATCH 1/4] BIDA-2: add gitignore --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 From 07a2096e6b6daeff5c0e14aafffa76c04dd65503 Mon Sep 17 00:00:00 2001 From: Willy Woitas Date: Mon, 22 Jan 2018 16:37:49 +0100 Subject: [PATCH 2/4] BIDA-2: add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e69de29..62c8935 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file From fe627feb884cf7eaa45232f1d57cd5fbc117ef90 Mon Sep 17 00:00:00 2001 From: Willy Woitas Date: Mon, 22 Jan 2018 16:41:50 +0100 Subject: [PATCH 3/4] BIDA-2: add nix zu lesen file --- willy-test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 willy-test.txt diff --git a/willy-test.txt b/willy-test.txt new file mode 100644 index 0000000..bd69c2c --- /dev/null +++ b/willy-test.txt @@ -0,0 +1 @@ +hier gibts nix zulesen \ No newline at end of file From dafc4bf3b05fbfad81e47aa0b5661cd8b6a3cd7b Mon Sep 17 00:00:00 2001 From: Willy Woitas Date: Mon, 22 Jan 2018 16:46:39 +0100 Subject: [PATCH 4/4] BIDA-2: change b.txt to provocating a merge conflict --- b.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b.txt b/b.txt index 413b11e..9088657 100644 --- a/b.txt +++ b/b.txt @@ -1 +1,4 @@ File B + Feature 2 +das +asd +not going \ No newline at end of file