From a2d9ab4841c6a2ccacab883825478b90a3d581f4 Mon Sep 17 00:00:00 2001 From: yaoit8791 Date: Sat, 1 Jul 2023 11:09:45 +0800 Subject: [PATCH 1/3] added Python folder and script --- Python/Test.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Python/Test.py diff --git a/Python/Test.py b/Python/Test.py new file mode 100644 index 0000000..ccc974e --- /dev/null +++ b/Python/Test.py @@ -0,0 +1,2 @@ +import json +print("Hello World!!!") From 2d5e00429ce1cb0c64f897f3fb040db1dfdfd416 Mon Sep 17 00:00:00 2001 From: yaoit8791 Date: Sat, 1 Jul 2023 11:36:32 +0800 Subject: [PATCH 2/3] Added changes for Lab 3 --- Python/Test-2.py | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Python/Test-2.py diff --git a/Python/Test-2.py b/Python/Test-2.py new file mode 100644 index 0000000..748045f --- /dev/null +++ b/Python/Test-2.py @@ -0,0 +1,3 @@ +import json +print("Hello World!!!") +print("Bye Bye World") \ No newline at end of file From 49282e4ae6efc3c146aa6cc5cb12f5717aff822f Mon Sep 17 00:00:00 2001 From: yaoit8791 Date: Sat, 1 Jul 2023 11:45:12 +0800 Subject: [PATCH 3/3] create conflict --- Python/Test-2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Python/Test-2.py b/Python/Test-2.py index 748045f..047aaf4 100644 --- a/Python/Test-2.py +++ b/Python/Test-2.py @@ -1,3 +1,4 @@ import json print("Hello World!!!") -print("Bye Bye World") \ No newline at end of file +print("Bye Bye World") +print("created conflict") \ No newline at end of file