summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authormdubravski <mdubravski@gmail.com>2021-04-08 13:42:28 -0400
committermdubravski <mdubravski@gmail.com>2021-04-08 13:42:28 -0400
commitbbda9ef5e5801efdceff947a3a19d019d4ef2627 (patch)
tree93f5d496f9257a868dd93045db96dea3378dd208 /numpy
parente8429ef4a199b88f3a97764a099ce3891163aeef (diff)
downloadnumpy-bbda9ef5e5801efdceff947a3a19d019d4ef2627.tar.gz
shortened length of line 287 in genapi.py
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/code_generators/genapi.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py
index 32173cbd3..7c1cdb26b 100644
--- a/numpy/core/code_generators/genapi.py
+++ b/numpy/core/code_generators/genapi.py
@@ -284,12 +284,8 @@ def find_functions(filename, tag='API'):
except ParseError:
raise
except Exception as e:
-<<<<<<< HEAD
raise ParseError(filename, lineno + 1,
"see chained exception for details") from e
-=======
- raise ParseError(filename, lineno + 1, "see chained exception for details") from e
->>>>>>> 3581e89c6a47e9df0bd0dfa898ee70c6368f2199
fo.close()
return functions