Skip to content

Commit 224a578

Browse files
Resolve a conflict #13890 #13891
1 parent 82f7c4a commit 224a578

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

.github/workflows/oci-make.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@
55
#
66
name: OCI (make)
77
on:
8-
<<<<<<< HEAD
9-
push:
10-
paths-ignore:
11-
- '.github/workflows/secondary-umbrella.yaml'
12-
- '.github/workflows/update-elixir-patches.yaml'
13-
- '.github/workflows/update-otp-patches.yaml'
14-
- '.github/workflows/release-alphas.yaml'
15-
- '*.md'
16-
=======
178
pull_request:
189
paths:
1910
- deps/**
@@ -23,7 +14,6 @@ on:
2314
- rabbitmq-components.mk
2415
- packaging/**
2516
- .github/workflows/oci-make.yaml
26-
>>>>>>> 4efb3df39 (CI: tweak OCI build triggers)
2717
workflow_dispatch:
2818
inputs:
2919
otp_version:

0 commit comments

Comments
 (0)