[camel] branch camel-2.22.x updated: CAMEL-13005: Fix cherry-pick conflicts

[dm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dmvolod pushed a commit to branch camel-2.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.22.x by this push:
     new 094cd0f  CAMEL-13005: Fix cherry-pick conflicts
094cd0f is described below

commit 094cd0f44b5486a7eb0e946fb29df32dba168227
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Mon Dec 17 12:20:56 2018 +0300

    CAMEL-13005: Fix cherry-pick conflicts
---
 .../org/apache/camel/component/olingo4/Olingo4ComponentTest.java     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentTest.java b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentTest.java
index 13dfa91..4300553 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentTest.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/test/java/org/apache/camel/component/olingo4/Olingo4ComponentTest.java
@@ -98,13 +98,8 @@ public class Olingo4ComponentTest extends AbstractOlingo4TestSupport {
         final Long count = (Long)requestBodyAndHeaders("direct:readcount", null, headers);
         assertEquals(20, count.intValue());
 
-<<<<<<< HEAD
-        final ClientPrimitiveValue value = (ClientPrimitiveValue)requestBodyAndHeaders("direct://readvalue", null, headers);
-        LOG.info("Client value \"{}\" has type {}", value.toString(), value.getTypeName());
-=======
         final ClientPrimitiveValue value = (ClientPrimitiveValue)requestBodyAndHeaders("direct:readvalue", null, headers);
         LOG.info("Client value \"{}\" has type {}", value, value.getTypeName());
->>>>>>> ce98b24341a... CAMEL-13005: olingo4 component serviceUri not set
         assertEquals("Male", value.asPrimitive().toString());
 
         final ClientPrimitiveValue singleProperty = (ClientPrimitiveValue)requestBodyAndHeaders("direct:readsingleprop", null, headers);