chore: Adjust for backport

unoplatform · Jun 21, 2024 · 31a0676 · 31a0676
1 parent e83da54
commit 31a0676
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/.github/workflows/uno-updater.yml b/.github/workflows/uno-updater.yml
@@ -3,19 +3,6 @@ name: Update Uno Sdk
 on:
   schedule:
     - cron: '0 */6 * * *'
-<<<<<<< HEAD
-  pull_request:
-    branches:
-      - main
-<<<<<<< HEAD
-      - release/stable/*
-=======
->>>>>>> e7d0964 (ci: Updater fixes for release branches)
-    paths:
-      - .github/workflows/uno-updater.yml
-      - tools/Uno.Sdk.Updater/*
-=======
->>>>>>> 8aaa6af (ci: split cron and PR runner logic)
   workflow_dispatch:
     inputs:
       branch: