Resolved merge conflicts from commit 83ba3cf

zendframework · Jun 20, 2013 · 4290f30 · 4290f30
1 parent 61ea689
commit 4290f30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
@@ -24,9 +24,7 @@
 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,9 +13,7 @@
 use Zend\Cache\Storage\IteratorInterface;
 use Zend\Cache\Storage\StorageInterface;
 
-class KeyListIterator implements
-    IteratorInterface,
-    Countable
+class KeyListIterator implements IteratorInterface, Countable
 {
 
     /**