[camel] branch master updated: Fix missed conflict

[gnodet]

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

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new b94dcc3  Fix missed conflict
b94dcc3 is described below

commit b94dcc3c00b57a10e4c3574ab57cbcff96a6cf6f
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Mar 22 08:56:50 2021 +0100

    Fix missed conflict
---
 .../apache/camel/test/spring/junit5/CamelSpringTestSupport.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git 
a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
 
b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
index 21a135a..a50ddf2 100644
--- 
a/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
+++ 
b/components/camel-test/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/CamelSpringTestSupport.java
@@ -60,6 +60,7 @@ public abstract class CamelSpringTestSupport extends 
CamelTestSupport {
 
     public static final String TEST_CLASS_NAME_PROPERTY = "testClassName";
     public static final String TEST_CLASS_SIMPLE_NAME_PROPERTY = 
"testClassSimpleName";
+    public static final String TEST_DIRECTORY_PROPERTY = "testDirectory";
 
     protected static ThreadLocal<AbstractApplicationContext> threadAppContext 
= new ThreadLocal<>();
     protected static Object lock = new Object();
@@ -237,13 +238,6 @@ public abstract class CamelSpringTestSupport extends 
CamelTestSupport {
         return SpringCamelContext.springCamelContext(applicationContext, 
false);
     }
 
-<<<<<<< HEAD
-=======
-    public static final String TEST_CLASS_NAME_PROPERTY = "testClassName";
-    public static final String TEST_CLASS_SIMPLE_NAME_PROPERTY = 
"testClassSimpleName";
-    public static final String TEST_DIRECTORY_PROPERTY = "testDirectory";
-
->>>>>>> 12c7ea28844 (Make camel-jms tests run in parallel)
     public AbstractXmlApplicationContext newAppContext(String configLocation) 
throws BeansException {
         return newAppContext(configLocation, getClass(), 
getTranslationProperties());
     }