From 6bf9f43359f42dad79db3042cfb33c8f9e6b91a7 Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 07:34:33 +0700 Subject: [PATCH 1/8] Modify helloworld.py file --- helloworld.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 helloworld.py diff --git a/helloworld.py b/helloworld.py new file mode 100644 index 00000000..1dc45ac1 --- /dev/null +++ b/helloworld.py @@ -0,0 +1 @@ +print("Hello World!") \ No newline at end of file From a80cca87257891511446b5979c5dfd255e6f2e0c Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 07:42:39 +0700 Subject: [PATCH 2/8] Modify helloworld.py file --- helloworld.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helloworld.py b/helloworld.py index 1dc45ac1..d9300d9e 100644 --- a/helloworld.py +++ b/helloworld.py @@ -1 +1,2 @@ -print("Hello World!") \ No newline at end of file +print("Hello World!") +print("Hello OSS Development") \ No newline at end of file From 409a58e329317480d79dc8427d27469c0303a6f0 Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 07:45:52 +0700 Subject: [PATCH 3/8] Modify helloworld.py file --- helloworld.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helloworld.py b/helloworld.py index d9300d9e..b50832e4 100644 --- a/helloworld.py +++ b/helloworld.py @@ -1,2 +1,3 @@ print("Hello World!") -print("Hello OSS Development") \ No newline at end of file +print("Hello OSS Development") +print("Hello CTU") \ No newline at end of file From 2d3e429c6b7ac9f5e7dd0d1b052e0e8c78eecbcc Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 07:48:06 +0700 Subject: [PATCH 4/8] Modify helloworld.py file --- helloworld.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helloworld.py b/helloworld.py index b50832e4..15d50aec 100644 --- a/helloworld.py +++ b/helloworld.py @@ -1,3 +1,4 @@ print("Hello World!") print("Hello OSS Development") -print("Hello CTU") \ No newline at end of file +print("Hello CTU") +print("Hello CTU - CIT") From 0063ab49380c421d56b4eeb8cbf96a4c9c7e310d Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 07:54:47 +0700 Subject: [PATCH 5/8] Modify helloworld.py file --- helloworld.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helloworld.py b/helloworld.py index 15d50aec..5c7c0b7e 100644 --- a/helloworld.py +++ b/helloworld.py @@ -1,4 +1,4 @@ print("Hello World!") print("Hello OSS Development") print("Hello CTU") -print("Hello CTU - CIT") +# print("Hello CTU - CIT") From 794509c2b83e197b0b5ff024d03633b5390598e0 Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 07:56:46 +0700 Subject: [PATCH 6/8] Modify helloworld.py file --- helloworld.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/helloworld.py b/helloworld.py index d9300d9e..15d50aec 100644 --- a/helloworld.py +++ b/helloworld.py @@ -1,2 +1,4 @@ print("Hello World!") -print("Hello OSS Development") \ No newline at end of file +print("Hello OSS Development") +print("Hello CTU") +print("Hello CTU - CIT") From aa40b63c7cfb1dd43eb23e8f168929221c2cc94f Mon Sep 17 00:00:00 2001 From: KhangB2014922 Date: Tue, 19 Sep 2023 08:39:12 +0700 Subject: [PATCH 7/8] push by VS code --- ex3_lab3.py | 1 + hello.txt | 1 + helloworld.py.orig | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 ex3_lab3.py create mode 100644 helloworld.py.orig diff --git a/ex3_lab3.py b/ex3_lab3.py new file mode 100644 index 00000000..4c4e7f79 --- /dev/null +++ b/ex3_lab3.py @@ -0,0 +1 @@ +print("Test") \ No newline at end of file diff --git a/hello.txt b/hello.txt index 9ca13b8f..76cf2f06 100644 --- a/hello.txt +++ b/hello.txt @@ -1 +1,2 @@ Hello hello +test \ No newline at end of file diff --git a/helloworld.py.orig b/helloworld.py.orig new file mode 100644 index 00000000..019b5201 --- /dev/null +++ b/helloworld.py.orig @@ -0,0 +1,8 @@ +print("Hello World!") +print("Hello OSS Development") +print("Hello CTU") +<<<<<<< HEAD +# print("Hello CTU - CIT") +======= +print("Hello CTU - CIT") +>>>>>>> test_functions From 7a7bc18fb5881a8fb8b64eb7f206420ae3c4a4ec Mon Sep 17 00:00:00 2001 From: HuynhMinhKhangB2014922 Date: Tue, 26 Sep 2023 16:15:09 +0700 Subject: [PATCH 8/8] upload via VS code --- ex3_lab3.py | 3 ++- hello.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ex3_lab3.py b/ex3_lab3.py index 4c4e7f79..08c2ec98 100644 --- a/ex3_lab3.py +++ b/ex3_lab3.py @@ -1 +1,2 @@ -print("Test") \ No newline at end of file +print("Test") +print("") \ No newline at end of file diff --git a/hello.txt b/hello.txt index 76cf2f06..23301b44 100644 --- a/hello.txt +++ b/hello.txt @@ -1,2 +1,2 @@ Hello hello -test \ No newline at end of file +test abc \ No newline at end of file