Resolved merge conflicts from commit 83ba3cf

zendframework · Jun 20, 2013 · ed3d22e · ed3d22e
1 parent 35bc5c2
commit ed3d22e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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
 {
 
     /**