From bc5962c17f1a62bad0c763489a193a508ec22fd0 Mon Sep 17 00:00:00 2001 From: csetarun2 Date: Wed, 14 Sep 2016 15:26:44 +0530 Subject: [PATCH 1/5] Revert "this is added one more line" This reverts commit 7ba3eec5d431f2bd8efca7f8f281439392c097a9. --- aa.py | 1 - 1 file changed, 1 deletion(-) diff --git a/aa.py b/aa.py index d4f87c3..3348e74 100644 --- a/aa.py +++ b/aa.py @@ -1,3 +1,2 @@ a="tarun hi" print a -print a From 83614d8f713521776bd3867fe8f25318ea198710 Mon Sep 17 00:00:00 2001 From: csetarun2 Date: Wed, 14 Sep 2016 15:30:22 +0530 Subject: [PATCH 2/5] ok deleted --- new1.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 new1.py diff --git a/new1.py b/new1.py deleted file mode 100644 index 416fc26..0000000 --- a/new1.py +++ /dev/null @@ -1 +0,0 @@ -print "hey" From e5606b34a799ac13179faa6ffb78969ce9ebe300 Mon Sep 17 00:00:00 2001 From: cooltechu Date: Wed, 14 Sep 2016 16:31:08 +0530 Subject: [PATCH 3/5] Update aa.py this is added one more line --- aa.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/aa.py b/aa.py index f2699de..2ff2dc8 100644 --- a/aa.py +++ b/aa.py @@ -1,6 +1,3 @@ a="tarun hi" print a -<<<<<<< HEAD -print "this is after brach added" -======= ->>>>>>> 83614d8f713521776bd3867fe8f25318ea198710 +print "this is i added from cooltechu" From 25ff7dd4a613aa46e4f6293fcb690973ef2ba5cf Mon Sep 17 00:00:00 2001 From: cooltechu Date: Wed, 14 Sep 2016 16:41:54 +0530 Subject: [PATCH 4/5] Update aa.py added one additional line here --- aa.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aa.py b/aa.py index 2ff2dc8..f631466 100644 --- a/aa.py +++ b/aa.py @@ -1,3 +1,5 @@ a="tarun hi" print a print "this is i added from cooltechu" +print "ok i added here" + From 398a8e64b1392aeddfb20a41a99856b400e77af4 Mon Sep 17 00:00:00 2001 From: cooltechu Date: Wed, 14 Sep 2016 16:57:43 +0530 Subject: [PATCH 5/5] Update aa.py --- aa.py | 1 + 1 file changed, 1 insertion(+) diff --git a/aa.py b/aa.py index f631466..61473b8 100644 --- a/aa.py +++ b/aa.py @@ -2,4 +2,5 @@ print a print "this is i added from cooltechu" print "ok i added here" +print "this is the third line i am here enter from "