Skip to content

Commit

Permalink
fix merge conflict for hakimel#1634
Browse files Browse the repository at this point in the history
  • Loading branch information
@hakimel
hakimel committed Oct 5, 2016
2 parents 02f95f4 + 59f3395 commit ce55d1a
Showing 1 changed file with 173 additions and 43 deletions.
Loading

0 comments on commit ce55d1a

Please sign in to comment.