fixing conflicts

This commit is contained in:
Abhinav Adduri 2017-07-19 12:17:24 -07:00
parent 69055a504b
commit 6670d9ad69
4 changed files with 11 additions and 6 deletions

View file

@ -14,7 +14,7 @@
<meta name="defaultLanguage" content="en-US">
<meta name="availableLanguages" content="en-US">
<link rel="localization" href="locales/send.{locale}.ftl">
<link rel="localization" href="/locales/send.{locale}.ftl">
<script defer src="/l20n/dist/web/l20n.js"></script>
</head>
<body>