search

wjchulme / OSWGmcr-MAPS-collaboration

2 stars 2 forks source link

updated PR #9

Closed ajstewartlang closed 5 years ago

ajstewartlang commented 5 years ago

Script updated and corrected synthetic dataset added - I have deleted the old (incorrect) one.

wjchulme commented 5 years ago

Hi @ajstewartlang there's a merge conflict because I updated the readme after you forked. Can you pull the latest version and try again?

ajstewartlang commented 5 years ago

Will do - I suspect it's the readme

Sent from my iPhone

On 2 May 2019, at 10:46, wjchulme notifications@github.com<mailto:notifications@github.com> wrote:

Hi @ajstewartlanghttps://github.com/ajstewartlang there's a merge conflict because I updated the readme after you forked. Can you pull the latest version and try again?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/wjchulme/OSWGmcr-MAPS-collaboration/pull/9#issuecomment-488613628, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AGIDA5BISDTWMTBQ7SNVPJDPTKZ7FANCNFSM4HJPAZJQ.