Update pyproject.toml

Author: timkpaine

pyproject.toml

@@ -20,6 +20,7 @@ keywords = [
 ]
 classifiers = [
     "Development Status :: 3 - Alpha",
+    "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
@@ -29,11 +30,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
-<<<<<<< before updating
-    "License :: OSI Approved :: Apache Software License",
-=======
     "Programming Language :: Python :: 3.14",
->>>>>>> after updating
 ]
 
 dependencies = [