Skip to content

Commit 85bce92

Browse files
committed
Fixed missed merge block
1 parent 2ce951c commit 85bce92

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

.github/workflows/pages-deploy.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ jobs:
4242
- name: Setup Ruby
4343
uses: ruby/setup-ruby@v1
4444
with:
45-
<<<<<<< HEAD
46-
ruby-version: 3.2
47-
=======
4845
ruby-version: 3.3
49-
>>>>>>> v7.2.0
5046
bundler-cache: true
5147

5248
- name: Build site
@@ -57,11 +53,7 @@ jobs:
5753
- name: Test site
5854
run: |
5955
bundle exec htmlproofer _site \
60-
<<<<<<< HEAD
61-
\-\-disable-external=true \
62-
=======
6356
\-\-disable-external \
64-
>>>>>>> v7.2.0
6557
\-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
6658
6759
- name: Upload site artifact

0 commit comments

Comments
 (0)