From ed3d22eb4e021deb3940b5bda49aa1628644049d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Wed, 12 Jun 2013 22:55:23 +0200 Subject: [PATCH 1/2] Resolved merge conflicts from commit 83ba3cf --- src/Writer/Feed.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Writer/Feed.php b/src/Writer/Feed.php index a43a847e..0922082c 100644 --- a/src/Writer/Feed.php +++ b/src/Writer/Feed.php @@ -15,9 +15,7 @@ /** */ -class Feed extends AbstractFeed implements - Iterator, - Countable +class Feed extends AbstractFeed implements Iterator, Countable { /** From 58f4e524accefe682a8f9e2180ff8cf6faeca99a Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Fri, 28 Jun 2013 11:03:53 -0500 Subject: [PATCH 2/2] [zendframework/zf2#4699] CS fixes - Trailing whitespace --- src/Reader/Extension/Syndication/Feed.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php index fbbf95fa..ae659d64 100644 --- a/src/Reader/Extension/Syndication/Feed.php +++ b/src/Reader/Extension/Syndication/Feed.php @@ -46,7 +46,7 @@ public function getUpdatePeriod() /** * Get update frequency - * + * * @return int */ public function getUpdateFrequency() @@ -64,7 +64,7 @@ public function getUpdateFrequency() /** * Get update frequency as ticks - * + * * @return int */ public function getUpdateFrequencyAsTicks()