Download & Extend
Basic » Issues

theme-settings.php

Posted by head on September 8, 2012 at 9:21am
Project:Basic
Version:7.x-3.x-dev
Component:Code
Category:bug report
Priority:normal
Assigned:Unassigned
Status:closed (duplicate)

Issue Summary

<<<<<<< HEAD

=======

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

What is this?
Login or register to post comments

Comments

#1

Posted by CompuBase on September 10, 2012 at 3:26pm
Priority:major» critical

#2

Posted by dubcanada on October 22, 2012 at 7:28pm

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

You can delete those :)

#3

Posted by dubcanada on October 22, 2012 at 7:39pm
Status:needs review» needs work

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.

AttachmentSize
botched_merge-1778670-3-patch.patch 2.58 KB

#4

Posted by head on November 29, 2012 at 8:09am
Priority:critical» normal
Status:needs work» fixed

#5

Posted by System Message on December 13, 2012 at 8:10am
Status:fixed» closed (fixed)

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

#6

Posted by imclean on January 22, 2013 at 11:52pm
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.

#7

Posted by joelpittet on February 24, 2013 at 12:36am
Status:active» closed (duplicate)

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