From e10fdfe3bef4a985802372fa0216b24c58dbe1ad Mon Sep 17 00:00:00 2001 From: Venky0426 Date: Mon, 27 May 2024 16:02:47 +0530 Subject: [PATCH 1/5] Firstcommit --- test.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 test.py diff --git a/test.py b/test.py new file mode 100644 index 0000000..34d86c4 --- /dev/null +++ b/test.py @@ -0,0 +1,6 @@ +#include +int main() { + // printf() displays the string inside quotation + printf("Hello, World!"); + return 0; +} From 684f8bf2e9eb7ce5a4863cf0257b5bf9a1fd8781 Mon Sep 17 00:00:00 2001 From: Venkey HM <156779372+Venky0426@users.noreply.github.com> Date: Mon, 27 May 2024 16:15:12 +0530 Subject: [PATCH 2/5] Update test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 34d86c4..5d46592 100644 --- a/test.py +++ b/test.py @@ -2,5 +2,5 @@ int main() { // printf() displays the string inside quotation printf("Hello, World!"); - return 0; + return ; } From 772e5e9f4c92592460496f47100c7db369e28e02 Mon Sep 17 00:00:00 2001 From: Venkey HM <156779372+Venky0426@users.noreply.github.com> Date: Mon, 27 May 2024 16:27:49 +0530 Subject: [PATCH 3/5] Updated test.py --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 5d46592..6aac0ee 100644 --- a/test.py +++ b/test.py @@ -2,5 +2,5 @@ int main() { // printf() displays the string inside quotation printf("Hello, World!"); - return ; + return 11; } From 79a689d4eccb5c1731fc9ba65ee792a8e05347b8 Mon Sep 17 00:00:00 2001 From: Venky0426 Date: Mon, 27 May 2024 16:32:44 +0530 Subject: [PATCH 4/5] resloved --- test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.py b/test.py index 34d86c4..ae179aa 100644 --- a/test.py +++ b/test.py @@ -2,5 +2,5 @@ int main() { // printf() displays the string inside quotation printf("Hello, World!"); - return 0; + return 12; } From 87423730d71777cff18abd96a5bd1e2dfc6f6a87 Mon Sep 17 00:00:00 2001 From: Venky0426 Date: Mon, 27 May 2024 17:27:08 +0530 Subject: [PATCH 5/5] Changes --- test.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test.py b/test.py index fee35bd..a6f9154 100644 --- a/test.py +++ b/test.py @@ -2,9 +2,13 @@ int main() { // printf() displays the string inside quotation printf("Hello, World!"); +<<<<<<< HEAD <<<<<<< HEAD return 12; ======= return 11; >>>>>>> 772e5e9f4c92592460496f47100c7db369e28e02 +======= + return 200 ; +>>>>>>> 8bce45b0c53397d7015e3f6aaffe9338d56acfaf }