From 7432b615978dde388acec2a1ab902f6eccb36263 Mon Sep 17 00:00:00 2001 From: Kun Lai Date: Mon, 18 Sep 2023 13:15:09 +0000 Subject: [PATCH] .clang-format: fix conflict style Signed-off-by: Kun Lai --- .clang-format | 2 -- 1 file changed, 2 deletions(-) diff --git a/.clang-format b/.clang-format index b208348..2a1db88 100644 --- a/.clang-format +++ b/.clang-format @@ -56,7 +56,6 @@ BraceWrapping: SplitEmptyFunction: true # Unknown to clang-format-4.0 SplitEmptyRecord: true # Unknown to clang-format-4.0 SplitEmptyNamespace: true # Unknown to clang-format-4.0 -BreakAfterJavaFieldAnnotations: true BreakBeforeBinaryOperators: None BreakBeforeBraces: Custom #BreakBeforeConceptDeclarations: false # Unknown to clang-format-9.0 @@ -141,7 +140,6 @@ SpaceBeforeInheritanceColon: true # Unknown to clang-format-6.0 SpaceBeforeParens: ControlStatements SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-6.0 #SpaceBeforeSquareBrackets: false # Unknown to clang-format-9.0 -SpaceInEmptyParentheses: false #SpaceInEmptyBlock: true # Unknown to clang-format-9.0 SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 1