Skip to content

Commit

Permalink
fix merge conflict on info.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@ErikHommel
ErikHommel committed Oct 28, 2016
2 parents 768a209 + bcfa865 commit f544d60
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit f544d60

Please sign in to comment.