Skip to content

Commit 9025e57

Browse files
Update merge_conflict.yml
1 parent 9f217ec commit 9025e57

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

.github/workflows/merge_conflict.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ jobs:
2525
- name: Merge develop branch and set up dependencies
2626
uses: ./.github/actions/merge-develop-and-set-up-dependencies
2727

28-
- name: Set up Python
29-
uses: actions/setup-python@v4
30-
with:
31-
python-version: '3.9'
32-
33-
- name: Install dependencies
34-
run: |
35-
python -m pip install --upgrade pip
36-
pip install requests
37-
3828
- name: Check PR Merge Conflicts
3929
env:
4030
GITHUB_REPOSITORY: ${{ github.repository }}

0 commit comments

Comments
 (0)