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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1955050af70f679a6aacc2f2946792eaf3af190">https://github.com/macports/macports-ports/commit/f1955050af70f679a6aacc2f2946792eaf3af190</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 f195505  TeXShop: now conflicts with TeXShop4
</span>f195505 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f1955050af70f679a6aacc2f2946792eaf3af190
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Apr 16 05:58:20 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    TeXShop: now conflicts with TeXShop4
</span>---
 aqua/TeXShop/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TeXShop/Portfile b/aqua/TeXShop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 75a10e6..13bd43a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/TeXShop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TeXShop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem      1.0
</span> PortGroup       xcode 1.0
 
 name            TeXShop
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts       TeXShop3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts       TeXShop4
</span> version         2.47
 set major       [lindex [split ${version} .] 0]
 categories      aqua editors
</pre><pre style='margin:0'>

</pre>