Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikc5000
erikc5000 committed Mar 5, 2021
2 parents facf257 + a152c72 commit c0cf670
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions .idea/codeStyles/Project.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c0cf670

Please sign in to comment.