Skip to content
Permalink
Browse files

Remove bad merge lines

  • Loading branch information...
Eric-Arellano committed Feb 26, 2019
1 parent 1be9e90 commit 225f1537194b67d99cdeb2eb99bbff04c61b5077
Showing with 0 additions and 2 deletions.
  1. +0 −2 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:

0 comments on commit 225f153

Please sign in to comment.
You can’t perform that action at this time.