fixed conflicts

1 files changed, 0 insertions, 25 deletions

diff --git a/jam-files/boost-build/util/regex.py b/jam-files/boost-build/util/regex.py
deleted file mode 100644
index 29e26ecf..00000000
--- a/jam-files/boost-build/util/regex.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#  (C) Copyright David Abrahams 2001. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears in
-#  all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
-
-import re
-
-def transform (list, pattern, indices = [1]):
-    """ Matches all elements of 'list' agains the 'pattern' 
-        and returns a list of the elements indicated by indices of 
-        all successfull matches. If 'indices' is omitted returns
-        a list of first paranthethised groups of all successfull
-        matches.
-    """
-    result = []
-
-    for e in list:
-        m = re.match (pattern, e)
-
-        if m:
-            for i in indices:
-                result.append (m.group (i))
-
-    return result
-