resolved conflicts

1 files changed, 12 insertions, 0 deletions

diff --git a/numpy/array_api/setup.py b/numpy/array_api/setup.py
new file mode 100644
index 000000000..c8bc29102
--- /dev/null
+++ b/numpy/array_api/setup.py
@@ -0,0 +1,12 @@
+def configuration(parent_package="", top_path=None):
+    from numpy.distutils.misc_util import Configuration
+
+    config = Configuration("array_api", parent_package, top_path)
+    config.add_subpackage("tests")
+    return config
+
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+
+    setup(configuration=configuration)