From 9c418ccad28a8febc95ad54cc8a6df94c60faea3 Mon Sep 17 00:00:00 2001 From: zoernert Date: Mon, 5 Feb 2024 23:20:28 +0000 Subject: [PATCH] Fix: Merge error of last commit --- framework/services/asset.service.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/framework/services/asset.service.js b/framework/services/asset.service.js index 4bfabbc..f9efac0 100644 --- a/framework/services/asset.service.js +++ b/framework/services/asset.service.js @@ -126,7 +126,6 @@ module.exports = { "clientMeta.location.country" : "text" } */ -<<<<<<< HEAD let query = {"assetId" : {$regex : ctx.params.q}}; if(typeof ctx.params.type !== 'undefined') { query.type = ctx.params.type; @@ -134,18 +133,6 @@ module.exports = { let res = await db.collection("assets").find(query).toArray(); for(let i=0;i>>>>>> 953c7d1924a207459fbcfa1ef8430cf37c8fce83 } return res; }