rahulg963 commented on a change in pull request #492: glim_gsim URL: https://github.com/apache/fineract/pull/492#discussion_r235473573
########## File path: fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java ########## @@ -110,7 +115,10 @@ import org.apache.fineract.portfolio.savings.exception.SavingsOfficerAssignmentException; import org.apache.fineract.portfolio.savings.exception.SavingsOfficerUnassignmentException; import org.apache.fineract.portfolio.savings.exception.TransactionUpdateNotAllowedException; +<<<<<<< HEAD import org.apache.fineract.portfolio.transfer.api.TransferApiConstants; +======= +>>>>>>> 5ecaff5dc... gsim and glim functionalities added Review comment: Please solve merge conflicts and remove these. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services