From e5455f337d8c87292840b72ef4045315605ef953 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2014 13:24:51 +0200 Subject: [PATCH 1/6] Added my name --- alex.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 alex.txt diff --git a/alex.txt b/alex.txt new file mode 100644 index 0000000..dc19643 --- /dev/null +++ b/alex.txt @@ -0,0 +1 @@ +Hello, my name is Alex! \ No newline at end of file From 65ebfa4b60ea779ee2606c7993331a2ebbe348b2 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2014 13:44:38 +0200 Subject: [PATCH 2/6] Mitt commitmeddelande# --- alex.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/alex.txt b/alex.txt index dc19643..1f3af66 100644 --- a/alex.txt +++ b/alex.txt @@ -1 +1,2 @@ -Hello, my name is Alex! \ No newline at end of file +Hello, my name is Alex! +I am 24 years old. \ No newline at end of file From 227dbe3f0da34bc9464d1b1ed2f98feef1586544 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2014 13:51:02 +0200 Subject: [PATCH 3/6] dogname --- dog.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 dog.txt diff --git a/dog.txt b/dog.txt new file mode 100644 index 0000000..f1a2210 --- /dev/null +++ b/dog.txt @@ -0,0 +1 @@ +My dogs name is Mozart! From 50aa495041ae7eba4243413db0434072098ff087 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2014 14:24:32 +0200 Subject: [PATCH 4/6] its working --- working.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 working.txt diff --git a/working.txt b/working.txt new file mode 100644 index 0000000..dea20f6 --- /dev/null +++ b/working.txt @@ -0,0 +1 @@ +this is working!! From 571024df8d663d3b48b5567e717b67fd01b8527b Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2014 14:26:02 +0200 Subject: [PATCH 5/6] Changed a little bit --- working.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/working.txt b/working.txt index dea20f6..f695aa5 100644 --- a/working.txt +++ b/working.txt @@ -1 +1,2 @@ this is working!! +let's conflict! From 2a842997d2004d4e379188fd6583621eed2388d6 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 8 Sep 2014 14:35:12 +0200 Subject: [PATCH 6/6] changed haha --- hello.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/hello.txt b/hello.txt index cfd2219..a658bd3 100644 --- a/hello.txt +++ b/hello.txt @@ -1,2 +1,3 @@ Hello World Hello Universe +hahahahahahhaahaha