Actually fix conflict

lint-requirements.txt

@@ -1,54 +1,29 @@
-<<<<<<< HEAD
 # This file was autogenerated by uv via the following command:
-#    uv pip compile lint-requirements.in
+#    uv pip compile --universal lint-requirements.in
 argcomplete==3.5.1
     # via nox
 black==24.10.0
-||||||| 49b59dd
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile lint-requirements.in
-#
-black==24.8.0
-=======
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile lint-requirements.in
-#
-black==24.10.0
->>>>>>> origin/main
     # via -r lint-requirements.in
-cffi==1.17.1
+cffi==1.17.1 ; platform_python_implementation != 'PyPy'
     # via cryptography
 click==8.1.7
     # via black
-<<<<<<< HEAD
-colorlog==6.8.2
+colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows'
+    # via
+    #   click
+    #   colorlog
+    #   pytest
+colorlog==6.9.0
     # via nox
-cryptography==43.0.1
-||||||| 49b59dd
-cryptography==42.0.4
-=======
-cryptography==43.0.3
->>>>>>> origin/main
+cryptography==44.0.0
     # via
     #   -r lint-requirements.in
     #   types-pyopenssl
-<<<<<<< HEAD
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
 filelock==3.16.1
     # via virtualenv
 idna==3.10
-||||||| 49b59dd
-idna==3.6
-=======
-idna==3.10
->>>>>>> origin/main
     # via -r lint-requirements.in
 iniconfig==2.0.0
     # via pytest
@@ -60,15 +35,9 @@ mypy-extensions==1.0.0
     # via
     #   black
     #   mypy
-<<<<<<< HEAD
-nox==2024.4.15
+nox==2024.10.9
     # via -r lint-requirements.in
-packaging==24.1
-||||||| 49b59dd
-packaging==24.1
-=======
 packaging==24.2
->>>>>>> origin/main
     # via
     #   black
     #   nox
@@ -81,9 +50,9 @@ platformdirs==4.3.6
     #   virtualenv
 pluggy==1.5.0
     # via pytest
-pycparser==2.22
+pycparser==2.22 ; platform_python_implementation != 'PyPy'
     # via cffi
-pytest==8.3.3
+pytest==8.3.4
     # via -r lint-requirements.in
 types-cffi==1.16.0.20240331
     # via types-pyopenssl
@@ -93,5 +62,5 @@ types-setuptools==75.6.0.20241126
     # via types-cffi
 typing-extensions==4.12.2
     # via mypy
-virtualenv==20.26.6
+virtualenv==20.28.0
     # via nox