From fd562d8a5be46c793c1821c4d380cef988ddf721 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 19 Jun 2020 13:53:07 -0100
Subject: conflicts

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5f46762a..4678b43e 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,7 @@ appstore: dev-setup lint build-js-production composer
 	--exclude=/translationfiles \
 	--exclude=/.tx \
 	--exclude=/tests \
-	--exclude=/.git \
-	--exclude=/vendor/friendica/json-ld/.git \
+	--exclude=.git \
 	--exclude=/.github \
 	--exclude=/.babelrc.js \
 	--exclude=/.drone.yml \
-- 
cgit v1.2.3