summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-08 20:00:45 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-08 20:00:45 -0400
commitdc4c5d4c79849f68063140f804de5567f0281d3f (patch)
tree5126a187968149c6ae305cb0ef396c2156258ec9
parent6968a3e4021dbd241c0193b47e8abf49c9281506 (diff)
downloadUXP-dc4c5d4c79849f68063140f804de5567f0281d3f.tar
UXP-dc4c5d4c79849f68063140f804de5567f0281d3f.tar.gz
UXP-dc4c5d4c79849f68063140f804de5567f0281d3f.tar.lz
UXP-dc4c5d4c79849f68063140f804de5567f0281d3f.tar.xz
UXP-dc4c5d4c79849f68063140f804de5567f0281d3f.zip
[BASILISK] Fix merge induced error in base jar.mn
-rw-r--r--application/basilisk/base/jar.mn2
1 files changed, 0 insertions, 2 deletions
diff --git a/application/basilisk/base/jar.mn b/application/basilisk/base/jar.mn
index f5fc2a807..19c089f37 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)