remove merge conflict formatting

4 months ago · c2bc2b4e8e
parent 47ed26598a
commit c2bc2b4e8e
1 changed files with 0 additions and 4 deletions
--- a/.clang-format
+++ b/.clang-format
@ -20,11 +20,7 @@ BinPackParameters: false
 ExperimentalAutoDetectBinPacking: true
 BreakBeforeBraces: Custom
 BraceWrapping:
-<<<<<<< HEAD
-  AfterFunction: true
-=======
  AfterFunction: false
->>>>>>> nonblocking
 ColumnLimit: 100
 AllowAllConstructorInitializersOnNextLine: false
 #BreakConstructorInitializersBeforeComma: true