The first lines of the file look like this:

<<<<<<< HEAD
<?php 
=======
<?php
>>>>>>> fdef2af7a665e2286fac94bc6ae60955a674b14f

That's obviously a leftover of a git merge and must be changed to

<?php
CommentFileSizeAuthor
#1 0001-correct-wrong-header-of-file.patch782 bytespluess

Comments

pluess’s picture

pluess commented
Status: Active » Needs review
StatusFileSize
new 0001-correct-wrong-header-of-file.patch782 bytes
miro_dietiker’s picture

miro_dietiker
Location Switzerland
commented
Status: Needs review » Fixed

Fixed. Added you as a maintainer. Please commit yourself if the situation is that clear.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

tinker’s picture

tinker commented
Version: 7.x-1.x-dev » 6.x-1.x-dev
Status: Closed (fixed) » Needs review

Exact same problem in 6.x-1.x-dev. The patch from #1 can be applied to this version too.

miro_dietiker’s picture

miro_dietiker
Location Switzerland
commented
Status: Needs review » Fixed

Fixed also for 6.x. Thanks.

tinker’s picture

tinker commented

Thanks for the speedy reply and commit miro_dietiker.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.