From 307842d235aac3fa78162e81a7d2d1d1f3e55780 Mon Sep 17 00:00:00 2001
From: miklobit <miklobit@gmail.com>
Date: Tue, 22 Nov 2022 19:37:14 +0100
Subject: [PATCH] align upstream

---
 Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Makefile b/Makefile
index 8f3b626a..4fe9c024 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,6 @@ clean-dev:
 	rm -rf node_modules
 
 composer:
-<<<<<<< HEAD
 	composer install --prefer-dist --ignore-platform-req=ext-gd
 	composer update --prefer-dist --ignore-platform-req=ext-gd
 
@@ -85,16 +84,11 @@ github-upload:
 		--tag v$(version) \
 		--name "$(app_name)-$(version).tar.gz" \
 		--file $(build_dir)/$(app_name)-$(version).tar.gz
-=======
-	composer install --prefer-dist --no-dev
-	composer upgrade --prefer-dist --no-dev
 
 composer-dev:
 	composer install --prefer-dist --dev
 	composer upgrade --prefer-dist --dev
 
-release: appstore
->>>>>>> 72be81700039485ac4ef71fecd62eee969bc4a91
 
 # creating .tar.gz + signature
 appstore: dev-setup lint build-js-production composer