<<<<<<< HEAD

=======

>>>>>>> 7.x-2.x

What is this?

CommentFileSizeAuthor
#3 botched_merge-1778670-3-patch.patch2.58 KBdubcanada
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

joep.hendrix’s picture

joep.hendrix CreditAttribution: joep.hendrix commented
Priority: Major » Critical
dubcanada’s picture

dubcanada CreditAttribution: dubcanada commented

Well those are headers from what looks like a botched but not cleaned up git merge.

You can delete those :)

dubcanada’s picture

dubcanada CreditAttribution: dubcanada commented
Status: Needs review » Needs work
FileSize
botched_merge-1778670-3-patch.patch2.58 KB

This should probably fix it.

Though Steve K should really fix the botched merge and clean up as he intended. I am not sure if he wanted to get rid of the IE stuff or not.

head’s picture

head CreditAttribution: head commented
Priority: Critical » Normal
Status: Needs work » Fixed

Status: Fixed » Closed (fixed)

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

imclean’s picture

imclean CreditAttribution: imclean commented
Status: Closed (fixed) » Active

This isn't fixed.

I've manually removed the extra lines but can't be sure what else should be removed.

joelpittet’s picture

joelpittet
Primary language English
Location Vancouver
CreditAttribution: joelpittet commented
Status: Active » Closed (duplicate)

Duplicate of #1905884: Bad merge reminences commited by accident.
Which is fixed in 0b8c42c