meonkeys commented on PR #6785: URL: https://github.com/apache/fineract/pull/6785#issuecomment-6503420524
[As discussed in chat](https://matrix.to/#/!wBAIdJZGsVdPfpHtOX:matrix.org/$-jRKqFarTlLeMkp2x4LSucHSft06GiuUhczdNGetdBc?via=matrix.org), I don't understand why there is a conflict... maybe some issue with a cherry-pick (Cc: @adamsaghy)? No matter, it looks like a simple conflict to resolve. (remove the `JobRepository` import, add the `0094_wc_loan_foreign_key_indexes.xml` migration...) 🤔 oh maybe a change was done (in a PR, maybe on develop, cherry-picked to release/1.16.1), then **undone** on develop. That would do it. Aman asked me to resolve the conflicts so I'll do that after the vote is resolved. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
