From 5b37c8c56f604f5a6637a90c2c2719a44045edbc Mon Sep 17 00:00:00 2001 From: Naveen Jakkireddy Date: Thu, 8 Jul 2021 08:31:23 +0530 Subject: [PATCH 1/6] updated main,condition --- condition_if_simple.py | 3 ++- main.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/condition_if_simple.py b/condition_if_simple.py index de2085e..e3575d7 100644 --- a/condition_if_simple.py +++ b/condition_if_simple.py @@ -2,9 +2,10 @@ def main(): Age=input("enter your Age:") if(int(Age)>18): print("welcome") + print("Hi") -if __name__ == '__main__':main() \ No newline at end of file +if __name__ == '__main__':main() diff --git a/main.py b/main.py index deed131..bc15cb2 100644 --- a/main.py +++ b/main.py @@ -5,6 +5,7 @@ def main(): print("hello from python") print("next line execute") + print("next line execute") if __name__ == '__main__':main() From 479815a08c29510f611f2dec0c0fa144392e489e Mon Sep 17 00:00:00 2001 From: naveenreddy99 Date: Thu, 8 Jul 2021 08:40:37 +0530 Subject: [PATCH 2/6] Update function.py --- function.py | 1 + 1 file changed, 1 insertion(+) diff --git a/function.py b/function.py index a871c90..43e9529 100644 --- a/function.py +++ b/function.py @@ -8,6 +8,7 @@ def SumNumbers(n1,n2): def main(): result= SumNumbers(3,5) print("z={}".format(result)) + print("Completed") From 994b00749b0d5b66a8e03345e8c161bf5a5f1edf Mon Sep 17 00:00:00 2001 From: naveenreddy99 Date: Thu, 8 Jul 2021 08:43:42 +0530 Subject: [PATCH 3/6] Update function.py --- function.py | 1 + 1 file changed, 1 insertion(+) diff --git a/function.py b/function.py index 43e9529..1a70bb7 100644 --- a/function.py +++ b/function.py @@ -9,6 +9,7 @@ def main(): result= SumNumbers(3,5) print("z={}".format(result)) print("Completed") + print("Completed1") From cdeb7dcd283ca7ad3c0e7740e1074c9276383819 Mon Sep 17 00:00:00 2001 From: Naveen Jakkireddy Date: Thu, 8 Jul 2021 08:46:12 +0530 Subject: [PATCH 4/6] changed sumnumber --- function.py | 1 + 1 file changed, 1 insertion(+) diff --git a/function.py b/function.py index 43e9529..3da6413 100644 --- a/function.py +++ b/function.py @@ -2,6 +2,7 @@ def SumNumbers(n1,n2): z=n1+n2 + print("test") return z From ab5b5f2b245b19a77068b87c848d54b7a215e08c Mon Sep 17 00:00:00 2001 From: Naveen Jakkireddy Date: Thu, 8 Jul 2021 09:10:06 +0530 Subject: [PATCH 5/6] change to func from branch --- function.py | 1 + 1 file changed, 1 insertion(+) diff --git a/function.py b/function.py index 5a23404..a44a27c 100644 --- a/function.py +++ b/function.py @@ -11,6 +11,7 @@ def main(): print("z={}".format(result)) print("Completed") print("Completed1") + print("Changes from my feature branch") From a78053c3d4dff11e24324e55e62f913ea8829637 Mon Sep 17 00:00:00 2001 From: Naveen Jakkireddy Date: Fri, 9 Jul 2021 08:30:08 +0530 Subject: [PATCH 6/6] modified main --- main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/main.py b/main.py index bc15cb2..deed131 100644 --- a/main.py +++ b/main.py @@ -5,7 +5,6 @@ def main(): print("hello from python") print("next line execute") - print("next line execute") if __name__ == '__main__':main()