…wp tags
@tcatapano and @thuchacz there is a conflict on 140r in tl
I've resolved it.
On Wed, May 8, 2019 at 10:05 AM Naomi Rosenkranz notifications@github.com wrote:
@tcatapano https://github.com/tcatapano and @thuchacz https://github.com/thuchacz there is a conflict on 140r in tl
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/cu-mkp/m-k-manuscript-data/pull/569#issuecomment-490499181, or mute the thread https://github.com/notifications/unsubscribe-auth/AFTLQARGANO7WNMGNGDNP7LPULMZTANCNFSM4HLN6ABQ .
@njr2128 I've resolved it—for some reason, my reply to your "conflict" message has come before your conflict message in this thread (!)