fix for merge

nuno1212s · May 25, 2019 · 59e780c · 59e780c
1 parent 2bf0813
commit 59e780c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/ApplicationClient/.idea/misc.xml b/ApplicationClient/.idea/misc.xml
diff --git a/ApplicationServer/.idea/compiler.xml b/ApplicationServer/.idea/compiler.xml
diff --git a/ApplicationServer/.idea/misc.xml b/ApplicationServer/.idea/misc.xml
diff --git a/ApplicationServer/.idea/vcs.xml b/ApplicationServer/.idea/vcs.xml