Various README.md improvements

7 years ago · c6757dd309
parent 23b0ff3d01
commit c6757dd309
1 changed files with 5 additions and 1 deletions
--- 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.