Skip to content

Commit

Permalink
Merge pull request #812 from chrishkchris/conflictfilename
Browse files Browse the repository at this point in the history
Resolve conflicts between dev and master due to change of filename
  • Loading branch information
nudles authored Oct 30, 2020
2 parents 2b9e0de + 6c0efbe commit da67921
Showing 1 changed file with 0 additions and 0 deletions.
File renamed without changes.

0 comments on commit da67921

Please sign in to comment.