From e8f0c1e5b13ee16c3770f4031f8aa573a894113c Mon Sep 17 00:00:00 2001 From: Zion Date: Fri, 13 May 2016 12:20:50 -0400 Subject: [PATCH 1/5] changing local repo --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9671fe3..a0535f4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # dataplay ## This is a test :) + +Now I've changed something wuahahahaha From 87422d45bce779d50633beea2d8bce632f47c169 Mon Sep 17 00:00:00 2001 From: zion Date: Mon, 16 May 2016 23:52:09 -0400 Subject: [PATCH 2/5] ready to lauch to github --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a0535f4..a873977 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # dataplay ## This is a test :) - -Now I've changed something wuahahahaha +causing merge conflict +maybe I should get merge-tools From 618d34c66b35a187b20d0a85596f6d1605771261 Mon Sep 17 00:00:00 2001 From: zion Date: Mon, 16 May 2016 23:54:44 -0400 Subject: [PATCH 3/5] merge conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a873977..f539551 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # dataplay ## This is a test :) -causing merge conflict +lalalallalal merge conflict maybe I should get merge-tools From c7fd950e832454c6c5c38ab19421365efde89b8c Mon Sep 17 00:00:00 2001 From: zion Date: Mon, 16 May 2016 23:55:50 -0400 Subject: [PATCH 4/5] change master --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f539551..0fa7b21 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # dataplay ## This is a test :) -lalalallalal merge conflict +merge conflict maybe I should get merge-tools From 5dd566f66d5991115b86c0a34ac5348fefaf006e Mon Sep 17 00:00:00 2001 From: zion Date: Mon, 16 May 2016 23:56:27 -0400 Subject: [PATCH 5/5] change b2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f539551..b39f7cf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # dataplay ## This is a test :) -lalalallalal merge conflict +lalal merge conflict finally maybe I should get merge-tools