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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6a47e574a5aab5aa3225ba5106026ef7a2fe744">https://github.com/macports/macports-ports/commit/a6a47e574a5aab5aa3225ba5106026ef7a2fe744</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 a6a47e5  libical: Remove conflicts
</span>a6a47e5 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a6a47e574a5aab5aa3225ba5106026ef7a2fe744
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Apr 7 13:22:44 2017 -0500

<span style='display:block; white-space:pre;color:#404040;'>    libical: Remove conflicts
</span>---
 devel/libical/Portfile | 2 --
 1 file changed, 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libical/Portfile b/devel/libical/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 382b660..3f78039 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libical/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libical/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,14 +10,12 @@ name                libical
</span> 
 if {${subport} eq "${name}"} {
     github.setup    libical libical 2.0.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts       libical-devel
</span> } else {
     # libical-devel:
     github.setup    libical libical 25bc500e15bafcef7324ec9b6472982b56dcdc6d
     version         1.0.1.351
     revision        1
     replaced_by     libical
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts       libical
</span>     distfiles
     pre-configure {
         ui_error "Please do not install this port since it has been replaced by 'libical'."
</pre><pre style='margin:0'>

</pre>