Fix merge conflict in README

README.md

@@ -4,8 +4,9 @@ This repository contains a small setup to automate the delivery of our root cert
 
 ### Files
 * `kto.crt` is our current only root certificate
+* `advancedsettings.xml` is a Kodi user configuration file (see []())
 #### Installation
-* `install.sh` copies the certificates to the right location and then reloads the system's certificates
+* `install.sh` copies the certificates to the right location and then reloads the system's certificates (Linux only)
 
 ### Firefox
 * On Mint, had to use the following so that Firefox uses system CAs:
@@ -14,3 +15,8 @@ sudo mv /usr/lib/firefox/libnssckbi.so /usr/lib/firefox/libnssckbi.so.bak
 sudo ln -s /usr/lib/x86_64-linux-gnu/pkcs11/p11-kit-trust.so /usr/lib/firefox/libnssckbi.so
 ```
 * Stil unclear: Will this be overwritten at Firefox update?
+
+### Kodi Android
+Since Android does not allow to import our root certificate, we have to import directly in Kodi:
+1. find Kodi app user data directory (usually `/sdcard/Android/data/org.xbmc.kodi`)
+2. copy `advancedsettings.xml` and `kto.crt` (renamed to `cacert.pem`) to `$KODI/files/.kodi/userdata/`

advancedsettings.xml

@@ -0,0 +1,5 @@
+<advancedsettings version="1.0">
+  <network>
+    <catrustfile>special://masterprofile/cacert.pem</catrustfile>
+  </network>
+</advancedsettings>