Remove bad merge lines

Eric-Arellano · Feb 26, 2019 · 225f153 · 225f153
1 parent 1be9e90
commit 225f153
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/python/pants/backend/python/tasks/python_binary_create.py b/src/python/pants/backend/python/tasks/python_binary_create.py
@@ -15,7 +15,6 @@
                                                             has_python_sources, has_resources,
                                                             is_python_target)
 from pants.backend.python.subsystems.python_native_code import PythonNativeCode
-from pants.backend.python.subsystems.python_setup import PythonSetup
 from pants.backend.python.targets.python_binary import PythonBinary
 from pants.backend.python.targets.python_requirement_library import PythonRequirementLibrary
 from pants.base.build_environment import get_buildroot
@@ -143,7 +142,6 @@ def _create_binary(self, binary_tgt, results_dir):
 
       # Add target-level and possibly global interpreter compatibility constraints to pex info.
       pex_builder.add_interpreter_constraints_from(constraint_tgts)
-      pex_builder.add_interpreter_constraint(PythonSetup.global_instance().interpreter_constraints)
 
       # Dump everything into the builder's chroot.
       for tgt in source_tgts: