From b0187221ca3083b7064586fb1283a1b1522a9b9a Mon Sep 17 00:00:00 2001
From: dholms <dtholmgren@gmail.com>
Date: Tue, 12 Mar 2024 14:36:07 -0500
Subject: [PATCH] build branch

---
 .github/workflows/build-and-push-bsky-aws.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/build-and-push-bsky-aws.yaml b/.github/workflows/build-and-push-bsky-aws.yaml
index fb67ec168c9..f83107de007 100644
--- a/.github/workflows/build-and-push-bsky-aws.yaml
+++ b/.github/workflows/build-and-push-bsky-aws.yaml
@@ -3,11 +3,7 @@ on:
   push:
     branches:
       - main
-<<<<<<< Updated upstream
-      - appview-v1-ozone-auth
-=======
       - appview-v1
->>>>>>> Stashed changes
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}