Resolved merge conflicts from commit a8eda2d

zendframework · Jun 20, 2013 · 61ea689 · 61ea689
commit 61ea689
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
@@ -24,7 +24,9 @@
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\EventsCapableInterface;
 
-abstract class AbstractAdapter implements StorageInterface, EventsCapableInterface
+abstract class AbstractAdapter implements
+    StorageInterface,
+    EventsCapableInterface
 {
     /**
      * The used EventManager if any

diff --git a/src/Storage/Adapter/KeyListIterator.php b/src/Storage/Adapter/KeyListIterator.php
@@ -13,7 +13,9 @@
 use Zend\Cache\Storage\IteratorInterface;
 use Zend\Cache\Storage\StorageInterface;
 
-class KeyListIterator implements IteratorInterface, Countable
+class KeyListIterator implements
+    IteratorInterface,
+    Countable
 {
 
     /**