This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit ecdafb7c6c8e75b39187410758263bfbc9021e20 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 22 09:56:41 2017 +0100 correction des erreurs de merge sur le master --- .../faxtomail/persistence/entities/EmailTopiaDao.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java index 0e73da14..a3d01543 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java @@ -423,14 +423,9 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { Email.PROPERTY_WAITING_STATE, Email.PROPERTY_TAKEN_BY, Email.PROPERTY_LAST_ATTACHMENT_OPENER, -<<<<<<< HEAD - Email.PROPERTY_LAST_PRINTING_USER - ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; -======= Email.PROPERTY_LAST_PRINTING_USER, Email.PROPERTY_LAST_ATTACHMENT_OPENER ) + " WHERE " + EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; ->>>>>>> refs/heads/release/2.4 // code copied from topia to perform search PaginationResult<String> pageResult = findPage(EMAIL_IDENTIFIER, hqlForFetchStep1, args, pagination); @@ -600,11 +595,7 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { Email.PROPERTY_TAKEN_BY, Email.PROPERTY_LAST_ATTACHMENT_OPENER, Email.PROPERTY_LAST_PRINTING_USER -<<<<<<< HEAD - ) + " WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; -======= ) + " WHERE " + EMAIL_IDENTIFIER + "." + TopiaEntity.PROPERTY_TOPIA_ID + " in ( :topiaIdsForFetch_ )"; ->>>>>>> refs/heads/release/2.4 if (log.isTraceEnabled()) { log.trace("getEmailForFolder 2 - " + hqlForFetchStep2); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.