Commit bfb63804 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents bbfd8d19 71598e4f
......@@ -2,6 +2,7 @@
** Copyright 2018, The LineageOS Project
** Copyright 2018-2019, The MoKee Open Source Project
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
......@@ -19,5 +20,5 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Remote server that can provide NTP responses. -->
<string translatable="false" name="config_ntpServer"></string>
<string translatable="false" name="config_ntpServer"></string>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment