From 4290f3024e0c854f91029a5fc1033eff6e77add1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 12 Jun 2013 22:55:23 +0200
Subject: [PATCH] Resolved merge conflicts from commit 83ba3cf

---
 src/Storage/Adapter/AbstractAdapter.php | 4 +---
 src/Storage/Adapter/KeyListIterator.php | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
index 3157a4103..3c2ea41d0 100644
--- 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
index ade65e69c..862995cf2 100644
--- 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
 {
 
     /**