From 9c100f2f9398013083caa618b1df92c9c0602080 Mon Sep 17 00:00:00 2001
From: anoy <anoymouserver+github@mailbox.org>
Date: Sat, 4 Nov 2023 21:36:30 +0100
Subject: fix merge errors

- js build was run twice
- engines were defined twice

Signed-off-by: anoy <anoymouserver+github@mailbox.org>
---
 Makefile     | 3 +--
 package.json | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e4f10f421..c59e3b9ea 100644
--- a/Makefile
+++ b/Makefile
@@ -83,9 +83,8 @@ endif
 # Installs npm dependencies
 .PHONY: npm
 npm:
-	$(npm) ci
-	$(npm) run build
 ifneq (, $(npm))
+	$(npm) ci
 	$(npm) run build
 else
 	@echo "npm command not available, please install nodejs first"
diff --git a/package.json b/package.json
index 352cc50b8..27c51e5a4 100644
--- a/package.json
+++ b/package.json
@@ -60,10 +60,6 @@
   "browserslist": [
     "extends @nextcloud/browserslist-config"
   ],
-  "engines": {
-    "node": "^16.0.0",
-    "npm": "^7.0.0 || ^8.0.0"
-  },
   "devDependencies": {
     "@babel/core": "^7.11.1",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-- 
cgit v1.2.3