ZF-10877: Conflict in HeadMeta

Issue Type:
Bug
Created:
2010-12-28T14:04:21.000+0000
Last Updated:
2010-12-29T05:32:24.000+0000
Status:
Resolved
Fix version(s):
  • 1.11.2 (30/Dec/10)
Reporter:
Ben Borowski (hacynth)
Assignee:
Matthew Weier O'Phinney (matthew)
Tags:
Related issues:
Attachments:

Description

Seems to be a conflict committed in http://framework.zend.com/svn/framework/… starting at line 165

Comments

Posted by Matthew Weier O'Phinney (matthew) on 2010-12-29T05:32:14.000+0000

Fixed in the 1.11 release branch; result of a bad merge.