1 files changed, 0 insertions, 8 deletions
diff --git a/cscript b/cscript
index c83bb8b64..bab0d4fd5 100644
--- a/cscript
+++ b/cscript
@@ -767,16 +767,8 @@ def package_debian(target, cpu, version, options):
     target.set('CDIST_DIRECTORY', target.directory)
 
     target.set('CDIST_CONFIGURE', '"' + configure_options(target, options, for_package=True) + '"')
-<<<<<<< HEAD
     target.set('CDIST_PACKAGE', f'{name}{suffix}')
-    target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
-||||||| e96f917d5
-    target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
-    target.set('CDIST_WX_VERSION', "3.2" if target.version in ("23.04", "23.10", "24.04") else "3.1")
-=======
-    target.set('CDIST_PACKAGE', f'dcpomatic{suffix}')
     target.set('CDIST_WX_VERSION', "3.1" if target.version in ("16.04", "18.04", "20.04", "22.04") else "3.2")
->>>>>>> origin/main
     if not target.debug:
         target.set('CDIST_DEBUG_PACKAGE_FLAG', '--no-ddebs')