merging branches

process-intelligence-solutions · Sep 21, 2021 · a78811e · a78811e
1 parent 63bb8d2
commit a78811e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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).