Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Andrew Buddenberg
gcis-py-client
Commits
067c7384
Commit
067c7384
authored
Mar 26, 2014
by
abuddenberg
Browse files
Merge branch 'master' of k3:/home/git/repositories/assessment/gcis-py-client
Conflicts: .gitignore
parents
6fe14a22
01ea4f39
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
067c7384
...
...
@@ -5,7 +5,6 @@
.settings
*.pyc
*.pk1
bin/*
src/blah.py
src/Blah.py
dist/images/*.png
...
...
Write
Preview
Supports
Markdown
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