From 67ffab5e6c59947fe952e595fbbd5b80989a4f69 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 12 Feb 2020 22:07:44 +0000 Subject: [PATCH 1/2] first test --- your-code/about-me.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/your-code/about-me.md b/your-code/about-me.md index 1b7eff3..4be3324 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -3,3 +3,5 @@ NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ---- Carla is a passionate, honest, web developer musician and financier. Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find. + +This is a conflict \ No newline at end of file From 38a0b089d75e7d4fa42d35e41da5479041396825 Mon Sep 17 00:00:00 2001 From: ximbalou <51138263+ximbalou@users.noreply.github.com> Date: Wed, 19 Feb 2020 17:51:16 +0000 Subject: [PATCH 2/2] creating a conlict --- your-code/about-me.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/your-code/about-me.md b/your-code/about-me.md index 4be3324..cff092c 100644 --- a/your-code/about-me.md +++ b/your-code/about-me.md @@ -1,7 +1 @@ -NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ---- - -Carla is a passionate, honest, web developer musician and financier. - -Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find. - -This is a conflict \ No newline at end of file +this will make a conflict \ No newline at end of file