From 0c150fa3bb2e13e87d4161d5acaa9b347be858f2 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 10 Jan 2026 12:17:59 +0100
Subject: [PATCH] fixes leftover in action

---
 .github/workflows/cmake-single-platform.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/cmake-single-platform.yml b/.github/workflows/cmake-single-platform.yml
index 52a50cf..9ad4f79 100644
--- a/.github/workflows/cmake-single-platform.yml
+++ b/.github/workflows/cmake-single-platform.yml
@@ -1,11 +1,7 @@
 name: Smoketest
 on:
   push:
-<<<<<<< HEAD
-    branches: [ "main" ]
-=======
-    branches: [ "*" ]
->>>>>>> 59096e7 (updates github action)
+    branches: [ "main", "develop" ]
   pull_request:
     branches: [ "main" ]
 
@@ -44,8 +40,3 @@ jobs:
       working-directory: ${{github.workspace}}
       run: build/${{env.BUILD_TYPE}}/src/riscv-vp --isa 'rv32gc_msu' -v INFO -f fw/hello-world/hello.elf
 
-
-
-
-
-