Resolve conflicts

2018-04-11 08:46:47 -03:00 · 2018-04-11 08:46:47 -03:00 · cc2c2b4333
parent e5341719dc
commit cc2c2b4333
1 changed files with 3 additions and 5 deletions
--- a/src/api/class-tainacan-rest-controller.php
+++ b/src/api/class-tainacan-rest-controller.php
@ -72,6 +72,7 @@ class TAINACAN_REST_Controller extends WP_REST_Controller {
 	 * @param $request
 	 *
 	 * @return array
+	 * @throws Exception
 	 */
 	protected function prepare_filters($request){
 		$queries = [
@ -97,12 +98,9 @@ class TAINACAN_REST_Controller extends WP_REST_Controller {
 			'paged'        => 'paged',
 			'postin'       => 'post__in',
 			'relation'     => 'relation',
-<<<<<<< HEAD
-			'nopaging'     => 'nopaging'
-=======
+			'nopaging'     => 'nopaging',
 			'meta_key'     => 'meta_key',
-			'meta_type'     => 'meta_type'
->>>>>>> 081c9b2e44413a5eb9b01c5fb20b6cd94b0dc233
+			'meta_type'    => 'meta_type'
 		];

 		$meta_query = [