From 4c3e3a6ae8b569c4c1f20bffa620386eab2db0d4 Mon Sep 17 00:00:00 2001 From: Gregor Date: Tue, 22 Jan 2019 10:42:42 +0100 Subject: [PATCH] Added kralik to conflicts because of the same namespace. --- composer.json | 3 ++- composer.lock | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c0b6b31..f249f33 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "php-sap/interfaces": "~1.0.0" }, "conflict": { - "php-sap/saprfc-harding": "*" + "php-sap/saprfc-harding": "*", + "php-sap/saprfc-kralik": "*" }, "minimum-stability": "stable", "require": { diff --git a/composer.lock b/composer.lock index 74ff220..d90edd9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0a1619fa8a0971942f7182aef47f3c75", + "content-hash": "57dc5597b8edc85749479e59c8e04e57", "packages": [ { "name": "php-sap/common",