Add Apache Software License classifier

Author: timkpaine

pyproject.toml

@@ -19,6 +19,7 @@ keywords = [
 ]
 classifiers = [
     "Development Status :: 4 - Beta",
+    "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
@@ -28,11 +29,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 = [
@@ -185,4 +182,4 @@ known-first-party = ["ccflow"]
 section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
 
 [tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["F401", "F403"]
+"__init__.py" = ["F401", "F403"]