From 175e05d128399805d59834f7e0a20101250785ac Mon Sep 17 00:00:00 2001
From: Hayden Spitzley <hspitzley@chanzuckerberg.com>
Date: Thu, 22 Aug 2024 15:30:23 -0600
Subject: [PATCH] fix bad merge

---
 .github/workflows/docker-build-rdev.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/docker-build-rdev.yaml b/.github/workflows/docker-build-rdev.yaml
index f6c38e1cc..64e617f34 100644
--- a/.github/workflows/docker-build-rdev.yaml
+++ b/.github/workflows/docker-build-rdev.yaml
@@ -1,14 +1,7 @@
 name: Docker Build Rdev
 
 on:
-<<<<<<< Updated upstream
-  pull_request:
-    types: [ labeled, synchronize ]
-    paths:
-      - 'apiv2/**'
-=======
   - push
->>>>>>> Stashed changes
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}