unclecheese/silverstripe-dropzone

Git conflict lines in file

Closed this issue 9 years ago · 0 comments

colinburns commented 9 years ago

Hi UncleCheese,

It looks like the commit you did today left some git conflicts lines in the file.

https://github.com/unclecheese/silverstripe-dropzone/blob/master/code/FileAttachmentField.php#L760

Cheers,
Colin