From cd9fcd265d99e52d4da02f5546483d802c074c98 Mon Sep 17 00:00:00 2001
From: Romuald du Song <romuald.dusong@deveryware.com>
Date: Sat, 23 Mar 2019 16:54:47 +0100
Subject: [PATCH] fix conflict

---
 data/helpers.d/nodejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/helpers.d/nodejs b/data/helpers.d/nodejs
index 1730990e7..098ed4410 100644
--- a/data/helpers.d/nodejs
+++ b/data/helpers.d/nodejs
@@ -99,7 +99,7 @@ ynh_install_nodejs () {
 
 	# Install the requested version of nodejs
 	uname=$(uname -m)
-	if [[ $uname =~ aarch64 ||  $uname =~ arm64 ]]
+	if [[ $uname =~ aarch64 || $uname =~ arm64 ]]
 	then
 		n $nodejs_version --arch=arm64
 	else