From 40961258de48e04f83b5b462a33331bdac2c3c40 Mon Sep 17 00:00:00 2001
From: Shawn Stratton <sstratton@php.net>
Date: Sat, 4 Sep 2010 18:38:34 -0400
Subject: [PATCH] Cleaned up merge from branch 'farazdagi'

---
 src/Reader/Extension/Syndication/Feed.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
index d877a801..af7e3aba 100644
--- 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