fix: resolve merge conflicts

Author: kkm-horikawa

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,3 +10,6 @@ Fixes # (issue)
 
 - [ ] I have added the relevant tests for this change.
 - [ ] I have added an item to the Pending section of ``docs/changes.rst``.
+
+#### AI/LLM Usage
+- [ ] This PR includes code generated with the help of an AI/LLM

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
     -   id: django-upgrade
         args: [--target-version, "4.2"]
 -   repo: https://github.com/adamchainz/djade-pre-commit
-    rev: "1.6.0"
+    rev: "1.7.0"
     hooks:
     -   id: djade
         args: [--target-version, "4.2"]
@@ -29,12 +29,12 @@ repos:
     -   id: rst-backticks
     -   id: rst-directive-colons
 -   repo: https://github.com/biomejs/pre-commit
-    rev: v2.3.8
+    rev: v2.3.10
     hooks:
       - id: biome-check
         verbose: true
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.14.8'
+    rev: 'v0.14.11'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

README.rst

@@ -40,7 +40,7 @@ Here's a screenshot of the toolbar in action:
 In addition to the built-in panels, a number of third-party panels are
 contributed by the community.
 
-The current stable version of the Debug Toolbar is 6.1.0. It works on
+The current stable version of the Debug Toolbar is 6.2.0. It works on
 Django ≥ 4.2.0.
 
 The Debug Toolbar has experimental support for `Django's asynchronous views

debug_toolbar/__init__.py

@@ -4,7 +4,7 @@
 
 # Do not use pkg_resources to find the version but set it here directly!
 # see issue #1446
-VERSION = "6.1.0"
+VERSION = "6.2.0"
 
 # Code that discovers files or modules in INSTALLED_APPS imports this module.
 urls = "debug_toolbar.urls", APP_NAME

docs/changes.rst

@@ -8,6 +8,11 @@ Pending
   limits. When ``SQLParseError`` is raised, the SQL panel now automatically
   disables grouping and retries formatting, preventing crashes with large
   queries.
+
+6.2.0 (2026-01-20)
+------------------
+
+
 * Deprecated ``RedirectsPanel`` in favor of ``HistoryPanel`` for viewing
   toolbar data from redirected requests.
 * Fixed support for generating code coverage comments in PRs.

docs/conf.py

@@ -25,7 +25,7 @@
 copyright = copyright.format(datetime.date.today().year)
 
 # The full version, including alpha/beta/rc tags
-release = "6.1.0"
+release = "6.2.0"
 
 
 # -- General configuration ---------------------------------------------------