You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@fineract.apache.org by GitBox <gi...@apache.org> on 2018/11/21 17:12:22 UTC

[GitHub] rahulg963 commented on a change in pull request #492: glim_gsim

rahulg963 commented on a change in pull request #492: glim_gsim
URL: https://github.com/apache/fineract/pull/492#discussion_r235470652
 
 

 ##########
 File path: fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/data/AccountSummaryCollectionData.java
 ##########
 @@ -27,18 +27,29 @@
 public class AccountSummaryCollectionData {
 
     private final Collection<LoanAccountSummaryData> loanAccounts;
+    private final Collection<LoanAccountSummaryData> groupLoanIndividualMonitoringAccounts;
     private final Collection<SavingsAccountSummaryData> savingsAccounts;
     private final Collection<ShareAccountSummaryData> shareAccounts ;
     private final Collection<GuarantorAccountSummaryData> guarantorAccounts;
     
     private final Collection<LoanAccountSummaryData> memberLoanAccounts;
     private final Collection<SavingsAccountSummaryData> memberSavingsAccounts;
+<<<<<<< HEAD
 
 Review comment:
   Hi, can you please solve these merge conflicts and remove these from the file.

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services