grep quick edit

python/grep/grep.py

@@ -47,10 +47,4 @@ def grep_individual(pattern, flags, filename):
             # Returns as soon as a match is found
             if localmatch(pattern, line):
                 return filename
-        return ''
+        return ''
-
-print(grep("may", "-n -m", ['grep_test.py']))
-=======
-def grep(pattern, flags, files):
-    pass
->>>>>>> refs/remotes/origin/master