rebase

2025-08-29 16:56:26 -04:00
parent 9462a1bf79
commit 3b0d2ac5c0
3 changed files with 38 additions and 2 deletions
--- a/setup.py
+++ b/setup.py
@@ -6,6 +6,7 @@ All configuration is now in pyproject.toml.

 from setuptools import setup

+<<<<<<< HEAD
 <<<<<<< HEAD
 from setuptools import find_packages, setup

@@ -181,6 +182,7 @@ setup(
    extras_require=extras_require_build,
 )
 =======
+=======
+>>>>>>> 7212dc6c (rebase)
 if __name__ == "__main__":
    setup()
->>>>>>> 01544ca0 (wip)