forked from data.coop/website
Remove merge conflict artifact
This commit is contained in:
parent
972616793e
commit
0de889b0c5
|
@ -3,18 +3,10 @@ name: default
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: build
|
- name: build
|
||||||
<<<<<<< HEAD
|
|
||||||
image: hugo
|
image: hugo
|
||||||
commands:
|
commands:
|
||||||
- wget https://github.com/gohugoio/hugo/releases/download/v0.62.1/hugo_0.62.1_Linux-64bit.deb -O hugo.deb
|
- wget https://github.com/gohugoio/hugo/releases/download/v0.62.1/hugo_0.62.1_Linux-64bit.deb -O hugo.deb
|
||||||
- dpkg -i hugo.deb
|
- dpkg -i hugo.deb
|
||||||
=======
|
|
||||||
image: ruby
|
|
||||||
commands:
|
|
||||||
- gem install bundler
|
|
||||||
- bundle install
|
|
||||||
- bundle exec jekyll build
|
|
||||||
>>>>>>> upstream/master
|
|
||||||
|
|
||||||
- name: docker
|
- name: docker
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
|
|
Loading…
Reference in a new issue