From 8a2d9d229fafc2b3a3c4c16e81b30f2541abad1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20Gr=C3=BCtzner?= Date: Fri, 29 Jun 2018 15:32:13 +0200 Subject: [PATCH 01/12] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 0a346fd..ddc9f6b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -Thgis is a test Repo for educational purposes -test \ No newline at end of file +Thgis is a test Repo for educational purposes \ No newline at end of file From 69300fed2bde3cf1406f53e3722cede7e403ef8f Mon Sep 17 00:00:00 2001 From: Dorian Zedler Date: Fri, 29 Jun 2018 19:24:09 +0200 Subject: [PATCH 02/12] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ddc9f6b..0a346fd 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -Thgis is a test Repo for educational purposes \ No newline at end of file +Thgis is a test Repo for educational purposes +test \ No newline at end of file From 967eab604f40705cdcc0e8ffce22fb314398c8c1 Mon Sep 17 00:00:00 2001 From: Daniel Jatsenko Date: Fri, 29 Jun 2018 19:25:44 +0200 Subject: [PATCH 03/12] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a346fd..c29e889 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ Thgis is a test Repo for educational purposes -test \ No newline at end of file +test +hallo \ No newline at end of file From d9053f1d9e5d004c96150e7aa0a52ae2eb0f5e37 Mon Sep 17 00:00:00 2001 From: CodeCrafter912 Date: Fri, 29 Jun 2018 19:50:47 +0200 Subject: [PATCH 04/12] =?UTF-8?q?hallo2=20hginzufgef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c29e889..81accf2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Thgis is a test Repo for educational purposes test -hallo \ No newline at end of file +hallo
+hallo2 \ No newline at end of file From e61155b554b16e443ad8d96dd66246e4a0806d74 Mon Sep 17 00:00:00 2001 From: Dani Date: Fri, 29 Jun 2018 19:57:10 +0200 Subject: [PATCH 05/12] =?UTF-8?q?hallo3=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 81accf2..3c49470 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ Thgis is a test Repo for educational purposes test hallo
-hallo2 \ No newline at end of file +hallo2 +hallo3
\ No newline at end of file From ec42da7c457acdd4e010738f2c8410c878155b91 Mon Sep 17 00:00:00 2001 From: Dani Date: Fri, 29 Jun 2018 20:00:38 +0200 Subject: [PATCH 06/12] =?UTF-8?q?test=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c49470..b894d9e 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Thgis is a test Repo for educational purposes test hallo
hallo2 -hallo3
\ No newline at end of file +test \ No newline at end of file From 3450f2bb4bc2695ff7fe7d30c768002d5c8db9fd Mon Sep 17 00:00:00 2001 From: CodeCrafter912 Date: Fri, 29 Jun 2018 20:00:55 +0200 Subject: [PATCH 07/12] changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c49470..a68fe3d 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Thgis is a test Repo for educational purposes test hallo
hallo2 -hallo3
\ No newline at end of file +auch hallo \ No newline at end of file From 144998385a9c2e9fb400c542255322149397f724 Mon Sep 17 00:00:00 2001 From: CodeCrafter912 Date: Fri, 29 Jun 2018 20:04:36 +0200 Subject: [PATCH 08/12] wer --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index db2e62a..f4eaf97 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,5 @@ Thgis is a test Repo for educational purposes test hallo
hallo2 -<<<<<<< HEAD auch hallo -======= test ->>>>>>> origin/master From 7cfc8ed6536712c9e36787556e5b8734c60b7875 Mon Sep 17 00:00:00 2001 From: Dani Date: Fri, 29 Jun 2018 20:05:17 +0200 Subject: [PATCH 09/12] zuppa --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f4eaf97..932a13e 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ hallo
hallo2 auch hallo test +zuppa From 1223f4ad4a01f1766b1836cf6a248fb102154372 Mon Sep 17 00:00:00 2001 From: Dani Date: Fri, 29 Jun 2018 20:10:14 +0200 Subject: [PATCH 10/12] tohl --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 932a13e..888a13a 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ hallo2 auch hallo test zuppa +tohl From 4246ef41c75207d253f93b003f336d4aad1b273a Mon Sep 17 00:00:00 2001 From: CodeCrafter912 Date: Fri, 29 Jun 2018 20:10:32 +0200 Subject: [PATCH 11/12] nochn test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 932a13e..cac6ac8 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ hallo2 auch hallo test zuppa +nochmal zuppa From 1c4b177219dd509c3b89f7b2202e6e2a100d47c7 Mon Sep 17 00:00:00 2001 From: CodeCrafter912 Date: Fri, 29 Jun 2018 20:12:27 +0200 Subject: [PATCH 12/12] merged --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index ecf7683..5f7523a 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,5 @@ hallo2 auch hallo test zuppa -<<<<<<< HEAD nochmal zuppa -======= ->>>>>>> 1223f4ad4a01f1766b1836cf6a248fb102154372 +tohl