From 31a06763059182b12a95d164dbe7a4c8abc2b400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Thu, 20 Jun 2024 21:26:24 -0400
Subject: [PATCH] chore: Adjust for backport

---
 .github/workflows/uno-updater.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.github/workflows/uno-updater.yml b/.github/workflows/uno-updater.yml
index bc36b759..1abb1868 100644
--- 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: