Resolved merge conflicts from commit 83ba3cf

zendframework · Jun 20, 2013 · 240c93a · 240c93a
1 parent 5fae315
commit 240c93a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -21,10 +21,7 @@
  * Implements Countable, Iterator and ArrayAccess
  * to facilitate easy access to the data.
  */
-class Config implements
-    Countable,
-    Iterator,
-    ArrayAccess
+class Config implements Countable, Iterator, ArrayAccess
 {
     /**
      * Whether modifications to configuration data are allowed.