From 9945e2499eee5e5c091b37c05c0eda1f36d8c5f4 Mon Sep 17 00:00:00 2001 From: "adam.ringle" Date: Fri, 2 Oct 2015 09:38:53 -0700 Subject: [PATCH 1/3] adding hello world --- 213.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/213.txt b/213.txt index 9f00003..4d4e156 100644 --- a/213.txt +++ b/213.txt @@ -1,2 +1,54 @@ hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world +hello world From b0feab99c95c369776bedb05d7c7f54e13f51535 Mon Sep 17 00:00:00 2001 From: "adam.ringle" Date: Fri, 2 Oct 2015 09:44:09 -0700 Subject: [PATCH 2/3] More gittiness --- conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict.txt b/conflict.txt index 26ddf3d..8bd8bb9 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,3 @@ git is very useful. -please keep your line here: +Ron Burgundy is a Git From 989be8fdf323d09ea4e957b643b01d18f4efca76 Mon Sep 17 00:00:00 2001 From: "adam.ringle" Date: Fri, 2 Oct 2015 11:05:52 -0700 Subject: [PATCH 3/3] More gittiness --- conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict.txt b/conflict.txt index 8bd8bb9..61dbcd4 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,3 @@ git is very useful. -Ron Burgundy is a Git +Ron Burgundy is a git