From c6757dd30924428fbe459899fb39c972a53c8c56 Mon Sep 17 00:00:00 2001
From: Kelson <kelson@kiwix.org>
Date: Sun, 25 Aug 2019 18:27:22 +0200
Subject: [PATCH] Various README.md improvements

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 25af853..ebcb481 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,11 @@ If you want to uninstall the Kiwix tools:
 ninja -C build uninstall
 ```
 
+<<<<<<< HEAD
 Like for the installation, you might need to run the command as `root`
+=======
+Like for the installation, you might need to run the command as root
+>>>>>>> Various README.md improvements
 (or using `sudo`).
 
 Docker
@@ -161,4 +165,4 @@ License
 -------
 
 [GPLv3](https://www.gnu.org/licenses/gpl-3.0) or later, see
-[LICENSE](LICENSE) for more details.
+[COPYING](COPYING) for more details.