Skip to content

Commit

Permalink
Merge branch 'release/0.1.0-2'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
Otetz committed May 29, 2017
2 parents 19355e3 + b726cf1 commit d1f4884
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/.cache
/*.egg-info
/.eggs
/build
/docs/_*
.cache
.eggs
build
docs/_build
*.egg-info

0 comments on commit d1f4884

Please sign in to comment.