Correct merge fomatting

Author: Twon

.github/workflows/cmake.yml

@@ -36,7 +36,7 @@ jobs:
           #     os: ubuntu-latest,
           #     compiler: { type: GCC, version: 12, conan: "gcc", cc: "gcc-12", cxx: "g++-12", std: 20 },
           #     lib: "libstdc++11"
-          #  }
+          #   }
           # - {
           #     name: "Ubuntu GCC-13",
           #     os: ubuntu-22.04,
@@ -48,7 +48,7 @@ jobs:
           #     os: ubuntu-24.04,
           #     compiler: { type: GCC, version: 14, conan: "gcc", cc: "gcc-14", cxx: "g++-14", std: 23 },
           #     lib: "libstdc++11"
-          #  }
+          #   }
           # - {
           #     name: "Ubuntu Clang-14 + libc++",
           #     os: ubuntu-22.04,