Merge git://git.zendframework.com/zf into serializer

zendframework · Sep 10, 2010 · 9bdfcd9 · 9bdfcd9
2 parents 0037391 + 4096125
commit 9bdfcd9
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
@@ -28,16 +28,6 @@
 use Zend\Date;
 
 /**
-<<<<<<< HEAD
-* @uses \Zend\Feed\Reader\Reader
-* @uses \Zend\Feed\Reader\Extension\EntryAbstract
-* @category Zend
-* @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
-*/
-class Feed extends Extension\AbstractFeed
-=======
  * @uses       \Zend\Date\Date
  * @uses       \Zend\Feed\Reader\Extension\AbstractFeed
  * @category   Zend
@@ -46,7 +36,6 @@ class Feed extends Extension\AbstractFeed
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
->>>>>>> master
 {
     /**
      * Get update period