Fix merge conflict markers in CI workflow file

Author: G36maid

.github/workflows/ci.yml

@@ -1,7 +1,6 @@
 name: Linmo CI (GNU Only)
 
 on:
-<<<<<<< HEAD
   push:
     branches: [main, ci]
   pull_request:
@@ -25,31 +24,6 @@ jobs:
           wget https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.06.13/riscv32-elf-ubuntu-22.04-gcc-nightly-2025.06.13-nightly.tar.xz
           tar -xf riscv32-elf-ubuntu-22.04-gcc-nightly-2025.06.13-nightly.tar.xz
           echo "$PWD/riscv/bin" >> $GITHUB_PATH
-=======
-    push:
-        branches: [main, ci]
-    pull_request:
-        branches: [main, ci]
-
-jobs:
-    test:
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Install dependencies
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install -y build-essential qemu-system-riscv32 wget
-
-            - name: Download RISC-V GNU Toolchain
-              run: |
-                  wget https://github.com/riscv-collab/riscv-gnu-toolchain/releases/download/2025.06.13/riscv32-elf-ubuntu-22.04-gcc-nightly-2025.06.13-nightly.tar.xz
-                  tar -xf riscv32-elf-ubuntu-22.04-gcc-nightly-2025.06.13-nightly.tar.xz
-                  echo "$PWD/riscv/bin" >> $GITHUB_PATH
->>>>>>> 5c5f004 (Improve CI workflow with QEMU, cpubench, timeout)
 
       - name: Verify toolchain installation
         run: |
@@ -65,7 +39,6 @@ jobs:
         env:
           CROSS_COMPILE: riscv32-unknown-elf-
 
-<<<<<<< HEAD
       - name: Build and run cpubench
         run: |
           make clean
@@ -96,13 +69,3 @@ jobs:
             ```
             ${{ steps.extract.outputs.result }}
             ```
-=======
-            - name: Build and run cpubench
-              run: |
-                  make clean
-                  make cpubench
-                  timeout 5s qemu-system-riscv32 -nographic -machine virt -bios none -kernel build/image.elf || true
-                  echo "cpubench completed"
-              env:
-                  CROSS_COMPILE: riscv32-unknown-elf-
->>>>>>> 5c5f004 (Improve CI workflow with QEMU, cpubench, timeout)