Yes, the conflict is because I squashed the commits to reduce the commit noise in the old repositories and remove the remaining sample classes. I wanted to rectify my mistakes but Myrle advised against doing this. I will fork a new one and submit these changes.
[ Full content available at: https://github.com/apache/fineract-cn-notifications/pull/5 ] This message was relayed via gitbox.apache.org for [email protected]
