build branch

bluesky-social · Mar 12, 2024 · b018722 · b018722
1 parent 7aa51f5
commit b018722
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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 }}