<<<<<<< HEAD
>>>>>>> 7.x-2.x

What is this?

#3 botched_merge-1778670-3-patch.patch2.58 KBdubcanada


joep.hendrix’s picture

Priority: Major » Critical
dubcanada’s picture

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

You can delete those :)

dubcanada’s picture

Status: Needs review » Needs work
2.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

Priority: Critical » Normal
Status: Needs work » Fixed

Status: Fixed » Closed (fixed)

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

imclean’s picture

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

Status: Active » Closed (duplicate)

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