92567c072a
Due a problem in the mergetool, the clang format was totally wrong in the previous commit.
Due a problem in the mergetool, the clang format was totally wrong in the previous commit.