merging branches

fit-alessandro-berti · fit-alessandro-berti · commit a78811e7ce5d · 2021-09-21T08:31:27.000+02:00
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).
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-<<<<<<< HEAD`
`2`	`1`	`'''`
`3`	`2`	`This file is part of PM4Py (More Info: https://pm4py.fit.fraunhofer.de).`
`4`	`3`