fix bad merge

chanzuckerberg · Aug 22, 2024 · 175e05d · 175e05d
1 parent cbc3a12
commit 175e05d
Showing 1 changed file with 0 additions and 7 deletions.
diff --git 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 }}