Skip to content

Commit 3335575

Browse files
authored
Update buildarm.yml
1 parent 299162e commit 3335575

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/buildarm.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,11 @@ jobs:
8989
- name: Install Dependencies
9090
run: |
9191
sudo apt-get update
92-
<<<<<<< HEAD
9392
sudo apt-get install -y chromium-browser python3-distutils build-essential libssl-dev make gcc g++
9493
9594
- name: Configure Python for node-gyp
9695
run: |
9796
sudo npm config set python $(which python3)
98-
=======
99-
sudo apt-get install -y chromium-browser python3-distutils python3-pip build-essential libssl-dev
100-
>>>>>>> fd5854b13d82956104126877874b00c7b1e3be2b
10197
10298
- name: Install Node.js
10399
uses: actions/setup-node@v4

0 commit comments

Comments
 (0)