<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/a445db290df5f67cc696eba1782daecbdc14f2ca">https://github.com/macports/macports-ports/commit/a445db290df5f67cc696eba1782daecbdc14f2ca</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 a445db2  starfighter: fix app icon
</span>a445db2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a445db290df5f67cc696eba1782daecbdc14f2ca
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Dec 22 12:47:41 2018 +1100

<span style='display:block; white-space:pre;color:#404040;'>    starfighter: fix app icon
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    File removed by conflicting commit.
</span>---
 games/starfighter/Portfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/starfighter/Portfile b/games/starfighter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ba1043..458be47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/starfighter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/starfighter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,5 +35,5 @@ depends_lib             port:libsdl2 \
</span> 
 patchfiles              src_Starfighter.cpp.patch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon                ${filespath}/alienDevice.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon                ${worksrcpath}/misc/starfighter.png
</span> app.identifier          org.nongnu.${app.name}
</pre><pre style='margin:0'>

</pre>