From cc2c2b4333fd3b8bee04e7e58a1d89e0596682c0 Mon Sep 17 00:00:00 2001 From: weryques Date: Wed, 11 Apr 2018 08:46:47 -0300 Subject: [PATCH] Resolve conflicts --- src/api/class-tainacan-rest-controller.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/api/class-tainacan-rest-controller.php b/src/api/class-tainacan-rest-controller.php index 274d4fa6d..4def0a462 100644 --- 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 = [