GNM-1226 qserver.yml corrected
diff --git a/qserver.yml b/qserver.yml
index f8b4872..fb87b9d 100644
--- a/qserver.yml
+++ b/qserver.yml
@@ -4,13 +4,8 @@
whiteListDocumenttypes: application/pdf,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel.sheet.macroEnabled.12,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-word.document.macroEnabled.12,image/png,image/jpeg
rabbitmqConfiguration:
-<<<<<<< HEAD
- host: 169.50.13.154
- port: 15672
-=======
host: localhost
port: 5672
->>>>>>> c431b2a4b5e906355a64dd0dc69b5e31ad63f85c
user: openk
password: openk
exchangeName: openk-pgm-exchange
