Commit a3bf4153 authored by Michael T Bailey's avatar Michael T Bailey

Fuck Git

parent e2904d61
*.sw*
*.pyc
*~
<<<<<<< HEAD
srctweb/website/build/
.venv
.virtualevn
=======
srctweb/_site/
.sass-cache/
.jekyll-metadata
>>>>>>> origin/1.0-jekyll-rewrite
<<<<<<< HEAD
image: python:2
pages:
script:
- pip install -r requirements.txt
- python srctweb/srctweb.py build
- mv srctweb/website/build/ public/
artifacts:
paths:
- public/
only:
- master
=======
image: ruby:2.3
variables:
......@@ -28,5 +14,4 @@ build:
- bundle exec jekyll build --trace -d '../build'
artifacts:
paths:
- build
>>>>>>> origin/1.0-jekyll-rewrite
- build
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment