Skip to content

Commit 2340bdf

Browse files
CHANGELOG.md and AUTHORS
Do not check for merge conflicts in AUTHORS file, because ======= in 2nd line triggers the error.
1 parent def3adf commit 2340bdf

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ repos:
1010
- id: check-ast
1111
- id: trailing-whitespace
1212
- id: check-merge-conflict
13+
exclude: AUTHORS
1314
- id: check-json
1415
- id: check-xml
1516
- id: check-yaml

‎AUTHORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Bas van Oostveen
2424
Dave Burkholder
2525
David Fischer
2626
David Smith
27+
Dawid Wolski
2728
Diego Garcia
2829
Dulmandakh Sukhbaatar
2930
Dylan Giesler

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
-->
1616

1717
## [Unreleased]
18+
### Added
19+
*#651 Batch expired token deletions in `cleartokens` management command
1820

1921
## [1.6.0] 2021-12-19
2022
### Added

0 commit comments

Comments
(0)