Skip to content
Permalink
Browse files

Bug 1134448 - merge pull request #28906 from zbraniecki:1134448-priva…

…cy-controls-fouc to mozilla-b2g:master
  • Loading branch information...
mozilla-autolander-deprecated committed Mar 17, 2015
2 parents fbe14c2 + 306528f commit 742e119da2ac84454638e2bbaa56ee4ab90d9a55
Showing with 1 addition and 5 deletions.
  1. +1 −1 apps/privacy-panel/index.html
  2. +0 −4 apps/privacy-panel/js/app.js
@@ -67,7 +67,7 @@
<link rel="import" href="/templates/about/main.html">

<!-- Shared JavaScripts -->
<!-- <script src="shared/js/l10n.js"></script> -->
<script defer src="shared/js/l10n.js"></script>
<!-- <script src="shared/js/settings_listener.js"></script> -->
<!-- <script src="shared/js/settings_helper.js"></script> -->
<!-- <script src="shared/js/settings_url.js"></script> -->
@@ -20,9 +20,6 @@ require.config({
},
'shared/async_storage': {
exports: 'asyncStorage'
},
'shared/l10n': {
exports: 'navigator.mozL10n'
}
}
});
@@ -50,7 +47,6 @@ require([
'panels',
'root/main',
'about/main',
'shared/l10n'
],

function(panels, root, about) {

0 comments on commit 742e119

Please sign in to comment.
You can’t perform that action at this time.