Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
srct.gmu.io
Commits
a3bf4153
Commit
a3bf4153
authored
Aug 10, 2017
by
Michael T Bailey
Browse files
Fuck Git
parent
e2904d61
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
a3bf4153
*.sw*
*.pyc
*~
<<<<<<< HEAD
srctweb/website/build/
.venv
.virtualevn
=======
srctweb/_site/
.sass-cache/
.jekyll-metadata
>>>>>>> origin/1.0-jekyll-rewrite
.gitlab-ci.yml
View file @
a3bf4153
<<<<<<< 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment