fix: merge conflicts

vinitkumar · vinitkumar · commit 0f1c9438fc9f · 2025-11-19T15:52:27.000+05:30
diff --git a/tests/requirements/py312-dj60-cms50-default.txt b/tests/requirements/py312-dj60-cms50-default.txt
@@ -14,7 +14,13 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
+<<<<<<< HEAD
 django==6.0b1
+||||||| fb4be63
+django==5.2.7
+=======
+django==5.2.8
+>>>>>>> master
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py312-dj60-cms50-versioning.txt b/tests/requirements/py312-dj60-cms50-versioning.txt
@@ -14,7 +14,13 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
+<<<<<<< HEAD
 django==6.0b1
+||||||| fb4be63
+django==5.2.7
+=======
+django==5.2.8
+>>>>>>> master
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py313-dj60-cms50-default.txt b/tests/requirements/py313-dj60-cms50-default.txt
@@ -14,7 +14,13 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
+<<<<<<< HEAD
 django==6.0b1
+||||||| fb4be63
+django==5.2.7
+=======
+django==5.2.8
+>>>>>>> master
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py313-dj60-cms50-versioning.txt b/tests/requirements/py313-dj60-cms50-versioning.txt
@@ -14,7 +14,13 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
+<<<<<<< HEAD
 django==6.0b1
+||||||| fb4be63
+django==5.2.7
+=======
+django==5.2.8
+>>>>>>> master
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/uv.lock b/uv.lock
