From 45c5a7b25bf4efbd89b7f516789ab3f9d37b3ef5 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Sat, 7 Oct 2023 18:00:12 -0700 Subject: [PATCH] oaknut: Fix clang-format errors Fixes some duplicate mapping key errors that occur when trying to run clang-format. ``` .../oaknut/.clang-format:9:1: error: duplicated mapping key 'AlignConsecutiveMacros' AlignConsecutiveMacros: None ^~~~~~~~~~~~~~~~~~~~~~ Error reading .../oaknut/.clang-format: Invalid argument ``` --- .clang-format | 3 --- 1 file changed, 3 deletions(-) diff --git a/.clang-format b/.clang-format index 28884fb..2e46255 100644 --- a/.clang-format +++ b/.clang-format @@ -2,7 +2,6 @@ Language: Cpp AccessModifierOffset: -4 AlignAfterOpenBracket: Align -AlignConsecutiveMacros: None AlignConsecutiveAssignments: None AlignConsecutiveBitFields: None AlignConsecutiveDeclarations: None @@ -175,7 +174,6 @@ SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceAfterLogicalNot: false SpaceAfterTemplateKeyword: false -SpaceAroundPointerQualifiers: Default SpaceBeforeAssignmentOperators: true SpaceBeforeCaseColon: false SpaceBeforeCpp11BracedList: false @@ -189,7 +187,6 @@ SpaceInEmptyBlock: false SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 2 SpacesInAngles: false -SpacesInConditionalStatement: false SpacesInCStyleCastParentheses: false SpacesInConditionalStatement: false SpacesInContainerLiterals: false