<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d990e38b9300434ed9737b62387b9f526a77e49b">https://github.com/macports/macports-ports/commit/d990e38b9300434ed9737b62387b9f526a77e49b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d990e38b9300434ed9737b62387b9f526a77e49b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Jul 28 20:18:50 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    opencascade: conflicts with oce
</span>---
 science/opencascade/Portfile | 3 +++
 1 file changed, 3 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opencascade/Portfile b/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 53e7155..e89b553 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,9 @@ checksums           rmd160  1e55daf36edaacca40eb12d2e187867b64e33c8f \
</span>                     sha256  7298c5eadc6dd0aeb6265ff2958e8e742d6e3aa65227acce8094f96f1bf6d2ac \
                     size    48576720
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# OCE is the Open CASCADE Community Edition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           oce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append   patch-CMakeLists.txt.diff \
                     patch-glext.h.diff \
                     patch-env.sh.in.diff
</pre><pre style='margin:0'>

</pre>