Skip to content

Commit c5ae6fe

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/compiler.xml # .idea/misc.xml # .idea/modules.xml # .idea/vcs.xml
2 parents 4a7b9e6 + 12bace5 commit c5ae6fe

3 files changed

Lines changed: 0 additions & 10 deletions

File tree

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)