master does not build - some files have version conflict markers

emufreak / iAmiga

iAmiga sources

47 stars 17 forks source link

Closed simontoens closed 8 years ago

simontoens commented 8 years ago

Looks like a bad merge. @emufreak could you have a look?

simontoens commented 8 years ago

@emufreak could you fix this?

emufreak commented 8 years ago

@simontoens Just fixed this

simontoens commented 8 years ago

I verified that master builds now, so closing this. Thanks @emufreak.