rahulg963 commented on a change in pull request #492: glim_gsim URL: https://github.com/apache/fineract/pull/492#discussion_r235470863
########## File path: fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java ########## @@ -47,10 +58,19 @@ public AccountSummaryCollectionData(final Collection<LoanAccountSummaryData> loa this.memberGuarantorAccounts = null; } +<<<<<<< HEAD public AccountSummaryCollectionData(final Collection<LoanAccountSummaryData> loanAccounts, final Collection<SavingsAccountSummaryData> savingsAccounts, final Collection<GuarantorAccountSummaryData> guarantorAccounts, final Collection<LoanAccountSummaryData> memberLoanAccounts, final Collection<SavingsAccountSummaryData> memberSavingsAccounts, final Collection<GuarantorAccountSummaryData> memberGuarantorAccounts) { +======= + /* Note to Self: GSIM not passed in*/ + + public AccountSummaryCollectionData(final Collection<LoanAccountSummaryData> loanAccounts,final Collection<LoanAccountSummaryData> groupLoanIndividualMonitoringAccounts, + final Collection<SavingsAccountSummaryData> savingsAccounts, final Collection<LoanAccountSummaryData> memberLoanAccounts, + final Collection<SavingsAccountSummaryData> memberSavingsAccounts) { +>>>>>>> 5ecaff5dc... gsim and glim functionalities added Review comment: same as above. ---------------------------------------------------------------- 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