From 8fc6cf1aa4128ac3f16b1b2d85622a57d61aac1a Mon Sep 17 00:00:00 2001
From: "Kunz, Immanuel" <immanuel.kunz@aisec.fraunhofer.de>
Date: Fri, 30 Sep 2022 09:18:27 +0200
Subject: [PATCH] Fix License conflict
---
LICENSE | 4 ----
1 file changed, 4 deletions(-)
diff --git a/LICENSE b/LICENSE
index 5b4df1b..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,8 +199,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-<<<<<<< HEAD
limitations under the License.
-=======
- limitations under the License.
->>>>>>> e1a202f (Updated)
--
GitLab