Closed andela-oogunjimi closed 8 years ago
I have resolved the conflicts.
On Thu, Oct 29, 2015 at 8:12 AM, Prosper Otemuyiwa <notifications@github.com
wrote:
Resolve the conflicts
— Reply to this email directly or view it on GitHub https://github.com/andela/pibbble/pull/94#issuecomment-152100004.
Opeyemi Ogunjimi | Software Developer | Andela (c) +234-703-936-2475 | Andela.com http://andela.com/
Resolve the conflicts