chore: resolve merge conflicts with master

mg-twentyone · mg-twentyone · commit bbf20abcd41f · 2025-08-25T18:43:49.000+02:00
diff --git a/setup.py b/setup.py
@@ -1,5 +1,7 @@
 from setuptools import setup
 
 setup(
+    # This is required to ensure the library name includes the python version, abi, and platform tags
+    # See issue #350 for more information
     has_ext_modules=lambda: True,
 )

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`from setuptools import setup`
`2`	`2`
`3`	`3`	`setup(`
	`4`	`+ # This is required to ensure the library name includes the python version, abi, and platform tags`
	`5`	`+ # See issue #350 for more information`
`4`	`6`	`has_ext_modules=lambda: True,`
`5`	`7`	`)`