<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/85e2d8bb80e717293ea122cb0b4b2fa48af2e128">https://github.com/macports/macports-ports/commit/85e2d8bb80e717293ea122cb0b4b2fa48af2e128</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 85e2d8bb80e717293ea122cb0b4b2fa48af2e128
</span>Author: Suhail Khan <26044674+suhailskhan@users.noreply.github.com>
AuthorDate: Sun Apr 13 16:13:05 2025 -0700

<span style='display:block; white-space:pre;color:#404040;'>    terraform: conflict with tenv
</span>---
 sysutils/terraform/Portfile | 2 ++
 1 file changed, 2 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/terraform/Portfile b/sysutils/terraform/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cb8de86680b..826de94cb8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/terraform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/terraform/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,6 +340,8 @@ if {${subport} eq ${name}} {
</span>                         to create links to the preferred default version \
                         of terraform.
     homepage            https://www.macports.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts           tenv
</span> 
     distfiles
     use_configure       no
</pre><pre style='margin:0'>

</pre>