You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/12/03 09:23:43 UTC
[5/5] camel git commit: CAMEL-8107: Fixed merge
CAMEL-8107: Fixed merge
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48a75fa3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48a75fa3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48a75fa3
Branch: refs/heads/camel-2.14.x
Commit: 48a75fa38ad62453ae01c34988cd5828ff834f77
Parents: 74821fd
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 3 08:58:16 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 3 08:58:16 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/48a75fa3/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index bdc3bd4..6fcc4fa 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -144,11 +144,8 @@ import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-<<<<<<< HEAD
-=======
import static org.apache.camel.util.StringQuoteHelper.doubleQuote;
->>>>>>> d00b08d... CAMEL-8107: Allow to use property placeholder with default values without having to setup the properties component
/**
* Represents the context used to configure routes and the policies to use.