Fix setup.py merge conflict.

gregchapman-dev · Aug 9, 2024 · 0ba675f · 0ba675f
1 parent 9d7b5b9
commit 0ba675f
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -13,7 +13,6 @@
 from setuptools import setup, find_packages
 import pathlib
 
-<<<<<<< HEAD
 musicdiffversion = '4.0.0'
 
 here = pathlib.Path(__file__).parent.resolve()