Skip to content
This repository has been archived by the owner on Nov 3, 2024. It is now read-only.

Commit

Permalink
-fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Michail Plushnikov committed Mar 9, 2014
1 parent 99fbf12 commit deec895
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .idea/misc.xml
View file

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

0 comments on commit deec895

Please sign in to comment.