From a791a8eed2e07bead28e9bba734842186ec10834 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Tue, 12 Sep 2017 08:40:00 +0200
Subject: [PATCH] refactor: resolve conflict
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 58be0b8..8941665 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
"type": "quiqqer-module",
"description": "The brick system allows you to design your website according to your wishes. You can quickly move, create, or remove bricks to different places in the template.",
"version": "dev-master",
- "license": "MIT",
+ "license": "",
"authors": [
{
"name": "Henning Leutz",
--
GitLab