From e7634d8ba26534288cf8622a9e9a93d7eefd0ff9 Mon Sep 17 00:00:00 2001
From: Cassiano <cassianotartari@gmail.com>
Date: Wed, 8 Oct 2014 17:15:57 -0300
Subject: [PATCH] Update RawPaginatorAdapter.php

---
 Paginator/RawPaginatorAdapter.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Paginator/RawPaginatorAdapter.php b/Paginator/RawPaginatorAdapter.php
index 7e2d49b..e6b6887 100644
--- a/Paginator/RawPaginatorAdapter.php
+++ b/Paginator/RawPaginatorAdapter.php
@@ -132,7 +132,6 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
 
         return $this->facets;
     }
-<<<<<<< HEAD
     
     /**
      * Returns Aggregations
@@ -146,9 +145,6 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
 
         return $this->aggregations;
     }
-    
-=======
->>>>>>> upstream/master
 
     /**
      * Returns the Query