Code

fix PEP420 namespace packages #1090

Code

Merged

msarahan merged 2 commits intoconda:1.21.xconda/conda-build:1.21.xfrom ivan-kalev:1.21.xCopy head branch name to clipboardJul 5, 2016

+72-2

Commits

Commits on Jul 4, 2016

• fix PEP420 namespace packages (resolves #1074)

  ivan-kalev

  committed
  93a43ba

  Copy full SHA for 93a43ba

Commits on Jul 5, 2016

• disallow merge conflicts when copying namespace trees

  ivan-kalev

  committed
  9dba727

  Copy full SHA for 9dba727