<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cba02541a019ecf8b815cbdbf2794c7703e84617">https://github.com/macports/macports-ports/commit/cba02541a019ecf8b815cbdbf2794c7703e84617</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new cba0254  py-setuptools: update to version 30.2.0
</span>cba0254 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit cba02541a019ecf8b815cbdbf2794c7703e84617
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Dec 5 13:40:31 2016 -0600

<span style='display:block; white-space:pre;color:#404040;'>    py-setuptools: update to version 30.2.0
</span>---
 python/py-setuptools/Portfile | 10 ++++++++++
 1 file changed, 10 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-setuptools/Portfile b/python/py-setuptools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74668bf..22c32c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-setuptools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-setuptools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,11 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-setuptools
<span style='display:block; white-space:pre;background:#e0ffe0;'>+<<<<<<< Updated upstream
</span> version             30.1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+=======
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             30.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+>>>>>>> Stashed changes
</span> categories-append   devel
 license             {PSF ZPL}
 maintainers         jmr openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +25,15 @@ homepage            https://pypi.python.org/pypi/setuptools/
</span> master_sites        pypi:s/setuptools/
 distname            setuptools-${version}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+<<<<<<< Updated upstream
</span> checksums           md5    cac497f42e5096ac8df29e38d3f81c3e \
                     rmd160 730ca72b566cb3771db5fa3e1f5d72f0b4c65538 \
                     sha256 73c7f183260cec2ef870128c77106ba7a978649b8c4cddc320ec3547615e885f
<span style='display:block; white-space:pre;background:#e0ffe0;'>+=======
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           md5     7f2ba59682bc8c6ae6f1f927aca1a351 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  9ae9477679551125ef605d3e035f90a409a4db08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+>>>>>>> Stashed changes
</span> 
 python.versions     26 27 33 34 35
 python.link_binaries no
</pre><pre style='margin:0'>

</pre>