From 11e24d1b3e3a5a718a0f7439c96aef2e889f0500 Mon Sep 17 00:00:00 2001 From: Niccolo Bonacchi Date: Mon, 2 Sep 2019 22:37:56 +0100 Subject: [PATCH 1/5] Foo barred it! --- my_module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/my_module.py b/my_module.py index 3856160..a10b7ac 100644 --- a/my_module.py +++ b/my_module.py @@ -1,3 +1,4 @@ print('Hello World!') print("Here's something interesting:\n") -# Add lines here, let's make this script do something ineterting!! +# Add lines here, let's make this script do something ineterting!! +print('Foo Bar') From 330d245bcd0be9d5b10053b8d906714ca30c7abb Mon Sep 17 00:00:00 2001 From: Gaelle Date: Mon, 2 Sep 2019 17:40:32 -0400 Subject: [PATCH 2/5] Check conflict in README between branch (from fork) and fork itself. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 12e0689..038519b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # ibl_code_camp_tutorials -This repo containss my_module.py, it does something interesting! \ No newline at end of file +This repo containss my_module.py, it does something interesting! + +# check for conflict \ No newline at end of file From 5a70394bd0aab49e1a77a378c2eb3dec69074e34 Mon Sep 17 00:00:00 2001 From: Mayo Faulkner Date: Mon, 2 Sep 2019 17:42:46 -0400 Subject: [PATCH 3/5] commiting chane --- my_module.py | 1 + 1 file changed, 1 insertion(+) diff --git a/my_module.py b/my_module.py index 3856160..a3e3a84 100644 --- a/my_module.py +++ b/my_module.py @@ -1,3 +1,4 @@ print('Hello World!') print("Here's something interesting:\n") # Add lines here, let's make this script do something ineterting!! +print('Hello gitkraken') From 2be67bd877f1e0ddae7297deb32cecedf72ba60e Mon Sep 17 00:00:00 2001 From: HernandoMV Date: Mon, 2 Sep 2019 17:52:55 -0400 Subject: [PATCH 4/5] for Nicco --- my_module.py | 1 + 1 file changed, 1 insertion(+) diff --git a/my_module.py b/my_module.py index 3856160..456cbd4 100644 --- a/my_module.py +++ b/my_module.py @@ -1,3 +1,4 @@ print('Hello World!') print("Here's something interesting:\n") # Add lines here, let's make this script do something ineterting!! +print("Ineterting is not a word") \ No newline at end of file From 1e9a175d2c356281824d981a4d55b5b6e5b091cf Mon Sep 17 00:00:00 2001 From: Gaelle Date: Mon, 2 Sep 2019 18:01:52 -0400 Subject: [PATCH 5/5] test2 README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 038519b..4335096 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # ibl_code_camp_tutorials This repo containss my_module.py, it does something interesting! -# check for conflict \ No newline at end of file +# check for conflict + +test2 \ No newline at end of file