FIX: wrong merge (#75)

Seems to be ok

Author: ned29

src/main/resources/public/raml/eiffel-intelligence.raml

@@ -27,7 +27,7 @@
   mediaType: application/json
   baseUri: /
   /subscriptions: !include subscription.raml
-  /query: !include queryservice.raml  
+  /query: !include query.raml
   /queryAggregatedObject: !include query-aggregated_object.raml
   /queryMissedNotifications: !include query-missed_notifications.raml
   /jmespathrule: !include jmespath.raml

src/test/java/com/ericsson/ei/queryservice/test/QueryServiceRESTAPITest.java

@@ -95,7 +95,7 @@ public void getQueryAggregatedObjectTest() throws Exception {
         MvcResult result = result = mockMvc.perform(requestBuilder).andReturn();
 
         String output = result.getResponse().getContentAsString().toString();
-        output = output.replaceAll("(\\s\\s\\s\\s)", "").replace("\\" + "n", "").replace("\\", "");
+        output = output.replaceAll("(\\s\\s\\s\\s)", "").replace("\\" + "n", "").replace("\\" + "r", "").replace("\\", "");
         log.info("The Output is : " + output);
 
         assertEquals(HttpStatus.OK.value(), result.getResponse().getStatus());
@@ -117,7 +117,7 @@ public void getQueryMissedNotificationsTest() throws Exception {
         MvcResult result = mockMvc.perform(requestBuilder).andReturn();
 
         String output = result.getResponse().getContentAsString().toString();
-        output = output.replaceAll("(\\s\\s\\s\\s)", "").replace("\\" + "n", "").replace("\\", "");
+        output = output.replaceAll("(\\s\\s\\s\\s)", "").replace("\\" + "n", "").replace("\\" + "r", "").replace("\\", "");
         log.info("The Output is : " + output);
 
         assertEquals(HttpStatus.OK.value(), result.getResponse().getStatus());