This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch 5.6.x
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/5.6.x by this push:
new 7edee29 TAP5-2659: fixing bad merge again
7edee29 is described below
commit 7edee2995d0d17401f4c0bfd40a316d7a04ad276
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Jan 30 11:55:54 2021 -0300
TAP5-2659: fixing bad merge again
---
.../tapestry5/internal/services/ComponentMessagesSourceImplTest.java | 5 -----
1 file changed, 5 deletions(-)
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
index e5eac14..9281746 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
@@ -18,12 +18,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Locale;
-<<<<<<< HEAD
-=======
-import org.apache.tapestry5.commons.Messages;
-import org.apache.tapestry5.commons.Resource;
import
org.apache.tapestry5.internal.pageload.DefaultComponentRequestSelectorAnalyzer;
->>>>>>> b4e776a80... TAP5-2659: wrong locale being picked up when using axis
import
org.apache.tapestry5.internal.services.messages.PropertiesFileParserImpl;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.Messages;
