修复冲突

Author: GoldenStain

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ exclude: |
 repos:
 # Common hooks
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v4.4.0
     hooks:
     -   id: check-added-large-files
     -   id: check-merge-conflict
@@ -55,7 +55,7 @@ repos:
     hooks:
     -   id: black
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.3
+    rev: v0.5.0
     hooks:
     -   id: ruff
         args: [--fix, --exit-non-zero-on-fix, --no-cache]
@@ -137,7 +137,7 @@ repos:
                 paddle/fluid/operators/CMakeLists.txt
             )$
 -   repo: https://github.com/PFCCLab/cmake-lint-paddle
-    rev: v1.5.2
+    rev: v1.5.1
     hooks:
     -   id: cmakelint
         args: [--config=./tools/codestyle/.cmakelintrc]