deploy: 9467a1f

_sources/package-structure-code/publish-python-package-pypi-conda.md.txt

@@ -141,7 +141,7 @@ package repository. Thus environments that contain packages
 installed from both pip and conda are more likely to yield
 dependency conflicts.
 
-Similarly installing packages from the default anaconda package mixed with the conda-forge channel can also lead to dependency conflicts.
+Similarly installing packages from the default anaconda channel mixed with the conda-forge channel can also lead to dependency conflicts.
 
 Many install packages directly from conda `defaults` channel. However, because
 this channel is managed by Anaconda, the packages available on it are

package-structure-code/publish-python-package-pypi-conda.html

@@ -631,7 +631,7 @@ <h3>Managing Python package dependency conflicts<a class="headerlink" href="#man
 package repository. Thus environments that contain packages
 installed from both pip and conda are more likely to yield
 dependency conflicts.</p>
-<p>Similarly installing packages from the default anaconda package mixed with the conda-forge channel can also lead to dependency conflicts.</p>
+<p>Similarly installing packages from the default anaconda channel mixed with the conda-forge channel can also lead to dependency conflicts.</p>
 <p>Many install packages directly from conda <code class="docutils literal notranslate"><span class="pre">defaults</span></code> channel. However, because
 this channel is managed by Anaconda, the packages available on it are
 limited to those that Anaconda decides should be core to a stable installation. The conda-forge channel was created to complement the <code class="docutils literal notranslate"><span class="pre">defaults</span></code> channel. It allows anyone to submit a package to be published in the channel . Thus, <code class="docutils literal notranslate"><span class="pre">conda-forge</span></code> channel ensures that a broad suite of user-developed community packages can be installed from conda.</p>