search

anchpop / wise_mans_haskell

Free book for learning Haskell
https://andre.tips/wmh/
48 stars 5 forks source link

resolve merge conflict #4

Closed samuelallan72 closed 5 years ago

samuelallan72 commented 5 years ago

There appeared to be a merge conflict committed. This should fix it.

samuelallan72 commented 5 years ago

Appears to have been since fixed... closing. :)

anchpop commented 5 years ago

sorry for not getting back to you! not sure what happened here

samuelallan72 commented 5 years ago

Nah it's fine. I'm pretty sure you fixed it pretty quickly in a larger changeset a long time ago anyway.

Le January 25, 2019 5:45:45 PM UTC, anchpop notifications@github.com a écrit :

sorry for not getting back to you! not sure what happened here

-- You are receiving this because you modified the open/close state. Reply to this email directly or view it on GitHub: https://github.com/anchpop/wise_mans_haskell/pull/4#issuecomment-457655568