Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Xevion
2019-07-23 23:05:27 -05:00
3 changed files with 19 additions and 2 deletions
+6 -1
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
from functools import partial
all_flags = ['n', 'l', 'i', 'v', 'x', 'm'] # m for multiple files
@@ -48,4 +49,8 @@ def grep_individual(pattern, flags, filename):
return filename
return ''
print(grep("may", "-n -m", ['grep_test.py']))
print(grep("may", "-n -m", ['grep_test.py']))
=======
def grep(pattern, flags, files):
pass
>>>>>>> refs/remotes/origin/master