Fix setup.py merge conflict.

gregchapman-dev · gregchapman-dev · commit 0ba675f36a1c · 2024-08-09T13:03:50.000-07:00
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()
