Hi, I have solved the merge conflict with the develop branch.
Thanks, On Mon, Oct 9, 2017 at 2:29 PM, Sanyam Goel <[email protected]> wrote: > Hi Nikhil, Ed, Nazeer, > > I'll solve the conflicting files in the PR within this week most probably > by Thursday. > > Thanks, > > On Sun, Oct 8, 2017 at 1:37 PM, Ed Cable <[email protected]> wrote: > >> Yes just mentors for now... >> >> On Sun, Oct 8, 2017 at 12:52 AM, Nikhil Pawar <[email protected]> wrote: >> >>> Sure Ed, is the meeting just for mentors? >>> >>> Regards, >>> Nikhil >>> >>> On Sunday 8 October 2017, 2:47:07 AM GMT-5, Ed Cable <[email protected]> >>> wrote: >>> >>> >>> Nikhil, >>> >>> Could you re-send this sam email to the Apache Fineract dev list so this >>> discussion can happen publicly. >>> >>> As an FYI, we the GSOC mentors have a meeting this Tuesday to do a >>> check-in on where all our projects from GSOC stand with merging. >>> >>> Ed >>> >>> On Sat, Oct 7, 2017 at 4:09 PM, Nikhil Pawar <[email protected]> wrote: >>> >>> Hi Sanyan, >>> >>> Hope you are doing well. >>> I wanted to start with the review of swagger implementation. >>> Could you please correct the conflicting files in the PR. >>> In the meanwhile, I am going to clone your PR and start understanding >>> its functionality. >>> >>> >>> Regards, >>> Nikhil >>> >>> >>> >>> >>> -- >>> *Ed Cable* >>> President/CEO, Mifos Initiative >>> [email protected] | Skype: edcable | Mobile: +1.484.477.8649 >>> <(484)%20477-8649> >>> >>> *Collectively Creating a World of 3 Billion Maries | *http://mifos.org >>> <http://facebook.com/mifos> <http://www.twitter.com/mifos> >>> >>> >> >> >> -- >> *Ed Cable* >> President/CEO, Mifos Initiative >> [email protected] | Skype: edcable | Mobile: +1.484.477.8649 >> >> *Collectively Creating a World of 3 Billion Maries | *http://mifos.org >> <http://facebook.com/mifos> <http://www.twitter.com/mifos> >> >> > > > -- > SANYAM GOEL > LinkedIn: https://goo.gl/6SJMg3 > Github: https://goo.gl/u51wRZ > Hackerrank: https://goo.gl/4kzLf7 > +91-9818060934 > -- SANYAM GOEL LinkedIn: https://goo.gl/6SJMg3 Github: https://goo.gl/u51wRZ Hackerrank: https://goo.gl/4kzLf7 +91-9818060934
