diff --git a/file1 b/file1 index 3951059..c256b82 100644 --- a/file1 +++ b/file1 @@ -1,5 +1,14 @@ + +THIS IS FILE UNDER FEATURE EDITS +THIS FILE IS GOOD + THIS IS FILE UNDER MASTER + +THIS IS FILE UNDER FEATURE EDITS + +======= #THIS IS FILE UNDER FEATURE EDITS This is release again #this release + diff --git a/pgm1.py b/pgm1.py index a040fa7..b1e92f5 100644 --- a/pgm1.py +++ b/pgm1.py @@ -24,6 +24,10 @@ def div(num1,num2): print (b[i]) i = i + 1 + +c = mult(3,1) +======= c = sub(3,1) + print(c)