fixed some merge conflicts which appeared for some unknown reason

2016-06-26 17:07:03 +03:00 · 2016-06-26 17:07:03 +03:00 · 06d69554d9
parent ffac7c1e34
commit 06d69554d9
2 changed files with 453 additions and 456 deletions
--- a/bulletin-board-server/build.gradle
+++ b/bulletin-board-server/build.gradle
@ -260,4 +260,3 @@ publishing {
 }
--- a/voting-booth/build.gradle
+++ b/voting-booth/build.gradle
@ -189,5 +189,3 @@ publishing {
    }
 }