Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Maizify committed Sep 19, 2016
2 parents 78fcb47 + f0e5331 commit 6607781
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
Loading

0 comments on commit 6607781

Please sign in to comment.