From a78811e7ce5dc6525ffab54fee967be7321e30f2 Mon Sep 17 00:00:00 2001
From: Alessandro Berti <a.berti@pads.rwth-aachen.de>
Date: Tue, 21 Sep 2021 08:31:27 +0200
Subject: [PATCH] merging branches

---
 pm4py/meta.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pm4py/meta.py b/pm4py/meta.py
index ce743ce20..f291398fa 100644
--- a/pm4py/meta.py
+++ b/pm4py/meta.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 '''
     This file is part of PM4Py (More Info: https://pm4py.fit.fraunhofer.de).