mirror of
https://github.com/Xevion/exercism.git
synced 2026-01-31 12:24:10 -06:00
Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
+6
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user