From 43bd0e2ea3fbc2d2943db818a0574d9dbdc501ec Mon Sep 17 00:00:00 2001 From: Christian Gawlik Date: Tue, 8 Apr 2014 10:39:29 +0200 Subject: [PATCH 1/4] git Test --- uebung1.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 uebung1.txt diff --git a/uebung1.txt b/uebung1.txt new file mode 100644 index 0000000..12c5cc8 --- /dev/null +++ b/uebung1.txt @@ -0,0 +1,2 @@ +ausdhna oahs dokn sdokasnd +asfhd \ No newline at end of file From 5f49d73148bff93f161cce53e3c6eb35116a26d5 Mon Sep 17 00:00:00 2001 From: Christian Gawlik Date: Tue, 8 Apr 2014 11:01:37 +0200 Subject: [PATCH 2/4] geb mir ein konflikt --- konflikt | 1 + 1 file changed, 1 insertion(+) create mode 100644 konflikt diff --git a/konflikt b/konflikt new file mode 100644 index 0000000..51bcfe9 --- /dev/null +++ b/konflikt @@ -0,0 +1 @@ +hier kommt gleich ein Fehler From 0b17897d6abab4c40a6b95d26edc643a43551ffd Mon Sep 17 00:00:00 2001 From: Christian Gawlik Date: Wed, 16 Apr 2014 20:47:54 +0200 Subject: [PATCH 3/4] is si --- konflikt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 konflikt diff --git a/konflikt b/konflikt deleted file mode 100644 index 51bcfe9..0000000 --- a/konflikt +++ /dev/null @@ -1 +0,0 @@ -hier kommt gleich ein Fehler From a7e56757fedbf87c8e87f223e70c4a11bf8e4a43 Mon Sep 17 00:00:00 2001 From: Christian Gawlik Date: Wed, 16 Apr 2014 20:48:23 +0200 Subject: [PATCH 4/4] weg damit --- uebung1.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 uebung1.txt diff --git a/uebung1.txt b/uebung1.txt deleted file mode 100644 index 12c5cc8..0000000 --- a/uebung1.txt +++ /dev/null @@ -1,2 +0,0 @@ -ausdhna oahs dokn sdokasnd -asfhd \ No newline at end of file