merge fixes

2025-12-06 15:15:01 -06:00 · 2019-07-23 23:09:05 -05:00
parent dd2174c65a
commit d75b7d8faf
3 changed files with 1 additions and 14 deletions
--- a/python/grep/grep.py
+++ b/python/grep/grep.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 from functools import partial

 all_flags = ['n', 'l', 'i', 'v', 'x', 'm'] # m for multiple files