fix conflict

2024-06-06 16:36:29 +08:00
parent 716638752b f3b6f8f264
commit 572c13f9dd
12 changed files with 580 additions and 645 deletions
--- a/2
+++ b/2
@@ -21,7 +21,7 @@ style: deps _style

 _check:
 	@black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
-	@ruff $(checkfiles)
+	@ruff check $(checkfiles)
 check: deps _check

 test: deps