search

JayVora-SerpentCS / OdooEduERP

Education ERP based on Odoo!
http://www.serpentcs.com
151 stars 181 forks source link

[DEL]To remove OCA standard author in EduERP module. #28

Closed KrishnaPrajapati-SerpentCS closed 7 years ago

JayVora-SerpentCS commented 7 years ago

fix conflicts plz. pull latest

JayVora-SerpentCS commented 7 years ago

Still there are conflicts

KrishnaPrajapati-SerpentCS commented 7 years ago

All conflicts are solved.

Not shown any one conflict.

On Fri, Dec 30, 2016 at 7:05 PM, Serpent Consulting Services Pvt Ltd < notifications@github.com> wrote:

Still there are conflicts

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/JayVora-SerpentCS/EduERPv8/pull/28#issuecomment-269772282, or mute the thread https://github.com/notifications/unsubscribe-auth/AWaen1rPYalZqghYnVwu28nlQQp5ncXxks5rNQiTgaJpZM4LWPf3 .

KrishnaPrajapati-SerpentCS commented 7 years ago

Solved All Conflicts

On Sat, Dec 31, 2016 at 9:44 AM, Krishna Prajapati < krishna.prajapati.serpentcs@gmail.com> wrote:

All conflicts are solved.

Not shown any one conflict.

On Fri, Dec 30, 2016 at 7:05 PM, Serpent Consulting Services Pvt Ltd < notifications@github.com> wrote:

Still there are conflicts

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/JayVora-SerpentCS/EduERPv8/pull/28#issuecomment-269772282, or mute the thread https://github.com/notifications/unsubscribe-auth/AWaen1rPYalZqghYnVwu28nlQQp5ncXxks5rNQiTgaJpZM4LWPf3 .

JayVora-SerpentCS commented 7 years ago

https://travis-ci.org/JayVora-SerpentCS/EduERPv8/jobs/187854930 fails

JayVora-SerpentCS commented 7 years ago

travis fails https://travis-ci.org/JayVora-SerpentCS/EduERPv8/builds/187858647