Closed ghost closed 9 years ago
Sorry to ask you to do this, but can you fix this again? Git doesn't think strings
files are text files, and so they won't do as much as show me a diff, much less automatically resolve merge changes. Sorry!
Hey, sure i will so this in a few hours :) No Problem:) Nate Parrott notifications@github.com schrieb am Mi., 10. Dez. 2014 um 04:20:
Sorry to ask you to do this, but can you fix this again? Git doesn't think strings files are text files, and so they won't do as much as show me a diff, much less automatically resolve merge changes. Sorry!
— Reply to this email directly or view it on GitHub https://github.com/nate-parrott/Flashlight/pull/179#issuecomment-66399014 .
Added the missing "i"