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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82758ed8684bcf9f12c7987c38455811f33653e9">https://github.com/macports/macports-ports/commit/82758ed8684bcf9f12c7987c38455811f33653e9</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 82758ed  net/wireshark2:  add conflict w/ wireshark24
</span><span style='display:block; white-space:pre;color:#404040;'>     new 9f7d1c6  Merge branch 'master' of github.com:macports/macports-ports
</span>82758ed is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 82758ed8684bcf9f12c7987c38455811f33653e9
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Wed May 9 16:01:05 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    net/wireshark2:  add conflict w/ wireshark24
</span>---
 net/wireshark2/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/Portfile b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e20ffe..06c81a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ checksums           sha256  8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01
</span>                     sha1    25ba24628acfc12d7541298255f50e8034e694b7 \
                     size    28851192
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           wireshark-devel wireshark wireshark22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           wireshark-devel wireshark wireshark22 wireshark24
</span> 
 depends_build-append \
                     port:pkgconfig
</pre><pre style='margin:0'>

</pre>