.clang-format: fix conflict style

Signed-off-by: Kun Lai <[email protected]>
inclavare-containers · Mar 25, 2024 · 7432b61 · 7432b61
1 parent 51363dd
commit 7432b61
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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