[X2Go-Commits] [pale-moon] 246/294: [BASILISK] Fix merge induced error in base jar.mn

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit dc4c5d4c79849f68063140f804de5567f0281d3f
Author: Matt A. Tobin <email at mattatobin.com>
Date:   Mon Apr 8 20:00:45 2019 -0400

    [BASILISK] Fix merge induced error in base jar.mn
---
 application/basilisk/base/jar.mn | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/basilisk/base/jar.mn b/application/basilisk/base/jar.mn
index f5fc2a8..19c089f 100644
--- a/application/basilisk/base/jar.mn
+++ b/application/basilisk/base/jar.mn
@@ -48,8 +48,6 @@ browser.jar:
         content/browser/abouthealthreport/abouthealth.js      (content/abouthealthreport/abouthealth.js)
         content/browser/abouthealthreport/abouthealth.css     (content/abouthealthreport/abouthealth.css)
 #endif
-        content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
-        content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
         content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
         content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git