From 330d245bcd0be9d5b10053b8d906714ca30c7abb Mon Sep 17 00:00:00 2001 From: Gaelle Date: Mon, 2 Sep 2019 17:40:32 -0400 Subject: [PATCH 1/2] 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 1e9a175d2c356281824d981a4d55b5b6e5b091cf Mon Sep 17 00:00:00 2001 From: Gaelle Date: Mon, 2 Sep 2019 18:01:52 -0400 Subject: [PATCH 2/2] 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