<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/596932858767e0f1a427c84bb27bf26dd772186d">https://github.com/macports/macports-ports/commit/596932858767e0f1a427c84bb27bf26dd772186d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 596932858767e0f1a427c84bb27bf26dd772186d
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue Jan 16 08:03:41 2018 -0600

<span style='display:block; white-space:pre;color:#404040;'>    oniguruma6: remove conflict with oniguruma4
</span>---
 devel/oniguruma6/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/oniguruma6/Portfile b/devel/oniguruma6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d0d2a5..47d18da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/oniguruma6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/oniguruma6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ long_description    Oniguruma is a regular expressions library in which \
</span> checksums           rmd160  525ec9ffe6795869f25576ecf8ab7271818abb3e \
                     sha256  95668aa22c8c975861b3435d2f2088adcdc3bf6395dc17bd2a2040cdb83b70e9
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           oniguruma4 oniguruma5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           oniguruma5
</span> 
 use_autoreconf      yes
 
</pre><pre style='margin:0'>

</pre>