From 632d82f82c4c7da0de353736ed47a362d815566b Mon Sep 17 00:00:00 2001 From: Stephen Connor Date: Fri, 9 Apr 2021 11:32:18 +0100 Subject: [PATCH 1/3] added a new test file --- content/Test-review.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 content/Test-review.txt diff --git a/content/Test-review.txt b/content/Test-review.txt new file mode 100644 index 000000000..ef9c20c69 --- /dev/null +++ b/content/Test-review.txt @@ -0,0 +1 @@ +test-review file content \ No newline at end of file From 3622adfd5b7642950b381cd68b69392a137d4dd5 Mon Sep 17 00:00:00 2001 From: cortex-sr <77968101+cortex-sr@users.noreply.github.com> Date: Tue, 13 Apr 2021 13:10:07 +0100 Subject: [PATCH 2/3] Update Test-review.txt --- content/Test-review.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/Test-review.txt b/content/Test-review.txt index ef9c20c69..0d4eba4c4 100644 --- a/content/Test-review.txt +++ b/content/Test-review.txt @@ -1 +1 @@ -test-review file content \ No newline at end of file +test-review file content modified by SR From 532efd1bb3d6872c770a0e0c37580a594c1461a8 Mon Sep 17 00:00:00 2001 From: Stephen Connor Date: Tue, 13 Apr 2021 13:12:11 +0100 Subject: [PATCH 3/3] Commit for review merge conflict --- content/Test-review.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/Test-review.txt b/content/Test-review.txt index ef9c20c69..64a74ecca 100644 --- a/content/Test-review.txt +++ b/content/Test-review.txt @@ -1 +1 @@ -test-review file content \ No newline at end of file +test-review file content - modified by cortex-src \ No newline at end of file