updates

src/snipper/fix_bf.py

@@ -69,7 +69,7 @@ def fix_f(lines, debug, keep=False):
     return lines2
 
 # stats = {'n': 0}
-def _block_fun(lines, start_extra, end_extra, keep=False, permute=False, questionmarks=false, halfquestionmarks=False, silent=False):
+def _block_fun(lines, start_extra, end_extra, keep=False, permute=False, questionmarks=False, halfquestionmarks=False, silent=False):
     methods = {'remove': 0}
     # if method not in ['remove', 'permute', 'questionmark', 'halfquestionmark']:
     #     assert False
@@ -124,15 +124,11 @@ def fix_b(lines, keep=False):
         if b == None:
             break
         args = {k:v for k, v in b['start_tag_args'].items() if len(k) > 0}
-<<<<<<< HEAD
         cutout.append( b['block'] )
         b['block'], dn = _block_fun(b['block'], start_extra=b['arg1'], end_extra=b['arg2'], **args, keep=keep)
-=======
-        cutout += b['block']
+        # cutout += b['block']
         # method = b['start_tag_args'].get('', 'remove')
-        b['block'], dn = _block_fun(b['block'], start_extra=b['arg1'], end_extra=b['arg1'], **args, keep=keep)
-
->>>>>>> 1006ff966030717f7654e4b98720394bb394bb57
+        # b['block'], dn = _block_fun(b['block'], start_extra=b['arg1'], end_extra=b['arg1'], **args, keep=keep)
         lines = block_join(b)
         # cutout +_=
         n += dn