From b9e5fd1a8e39d5f7eac0f8728bec89c222bead34 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/Paginator.php                 | 4 +---
 src/SerializableLimitIterator.php | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Paginator.php b/src/Paginator.php
index 6afb9e3..939a3fe 100644
--- a/src/Paginator.php
+++ b/src/Paginator.php
@@ -23,9 +23,7 @@
 use Zend\Stdlib\ArrayUtils;
 use Zend\View;
 
-class Paginator implements
-    Countable,
-    IteratorAggregate
+class Paginator implements Countable, IteratorAggregate
 {
 
     /**
diff --git a/src/SerializableLimitIterator.php b/src/SerializableLimitIterator.php
index be54c29..f9b1570 100644
--- a/src/SerializableLimitIterator.php
+++ b/src/SerializableLimitIterator.php
@@ -14,9 +14,7 @@
 use LimitIterator;
 use Serializable;
 
-class SerializableLimitIterator extends LimitIterator implements
-    Serializable,
-    ArrayAccess
+class SerializableLimitIterator extends LimitIterator implements Serializable, ArrayAccess
 {
 
     /**