deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update RawPaginatorAdapter.php

Browse source
This commit is contained in:
Cassiano 2014-10-08 17:15:57 -03:00
commit e7634d8ba2
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Paginator/RawPaginatorAdapter.php
View file

@ -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