Resolved merge conflicts from commit 83ba3cf

zendframework · Jun 20, 2013 · 295dff4 · 295dff4
1 parent ff68c88
commit 295dff4
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php
@@ -20,9 +20,7 @@
  *
  * AbstractContainer class for Zend\Navigation\Page classes.
  */
-abstract class AbstractContainer implements
-    Countable,
-    RecursiveIterator
+abstract class AbstractContainer implements Countable, RecursiveIterator
 {
     /**
      * Contains sub pages