Closed animate1978 closed 4 years ago
Am I supposed to something on my end? I'm not sure.
On Thu, Nov 7, 2019, 12:37 AM animate1978 notifications@github.com wrote:
Reopened #187 https://github.com/animate1978/MB-Lab/pull/187.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/animate1978/MB-Lab/pull/187?email_source=notifications&email_token=AKYHC3QLMIOSV7FA6R7FHBLQSOSR7A5CNFSM4JJX5SW2YY3PNVWWK3TUL52HS4DFWZEXG43VMVCXMZLOORHG65DJMZUWGYLUNFXW5KTDN5WW2ZLOORPWSZGOUWJFPNQ#event-2777831350, or unsubscribe https://github.com/notifications/unsubscribe-auth/AKYHC3SJVVSAL6XOF3GU6WDQSOSR7ANCNFSM4JJX5SWQ .
Nope I figured it out
The main issue with this merge is that it can't be automatically merged due to conflict with my repository, primarily in init.py. Being that I haven't ever gone through this process, not cleanly, this PR is draft until I research best way to merge the code changes.