Closed atherdon closed 6 years ago
I see this branch has conflicts. Should I try and resolve it?
Yes
On 24-Apr-2018 at 05:34 AM, Louise wrote:
I see this branch has conflicts. Should I try and resolve it?
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/ChickenKyiv/loopback-tutor-intern-10/pull/12#issuecomment-383808857, or mute the thread https://github.com/notifications/unsubscribe-auth/ABZrDq5_gCZ6px3aHplfxp_akXBv7oGrks5trrlwgaJpZM4TeZMc .
@louisevdb84 please merge this PR