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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/45ebd34fe441b43feea45cad340139d4e0353cc2">https://github.com/macports/macports-ports/commit/45ebd34fe441b43feea45cad340139d4e0353cc2</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 45ebd34  cfengine3: fix upgrade path from cfengine
</span>45ebd34 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 45ebd34fe441b43feea45cad340139d4e0353cc2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 17 05:50:37 2019 +1100

<span style='display:block; white-space:pre;color:#404040;'>    cfengine3: fix upgrade path from cfengine
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    The conflict caused replacement of cfengine with cfengine3 when
</span><span style='display:block; white-space:pre;color:#404040;'>    upgrading to fail.
</span>---
 sysutils/cfengine3/Portfile | 1 -
 1 file changed, 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cfengine3/Portfile b/sysutils/cfengine3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cc4171..e8bfbc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cfengine3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cfengine3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,6 @@
</span> PortSystem          1.0
 
 name                cfengine3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           cfengine
</span> version             3.12.1
 revision            0
 categories          sysutils
</pre><pre style='margin:0'>

</pre>