Fix git merge hiccup

author Bruno Perel <bperel@users.noreply.github.com>

Sat, 29 Feb 2020 10:11:30 +0000 (11:11 +0100)

committer Roeland Jago Douma <rullzer@users.noreply.github.com>

Mon, 2 Mar 2020 07:05:37 +0000 (08:05 +0100)
author Bruno Perel <bperel@users.noreply.github.com>
Sat, 29 Feb 2020 10:11:30 +0000 (11:11 +0100)
committer Roeland Jago Douma <rullzer@users.noreply.github.com>
Mon, 2 Mar 2020 07:05:37 +0000 (08:05 +0100)
diff --git a/doc/installing.rst b/doc/installing.rst

index 752207c467cc7c412a1f3711feba5ac343ffd816..c3be14073ac226eced2a11eb8f1e91f5dd9dab1a 100644 (file)
--- a/doc/installing.rst
+++ b/doc/installing.rst
@@ -36,8 +36,7 @@ System Requirements
  - openSUSE Leap 42.2 & 42.3
  
  .. note::
-   For Linux distributions, we support, if technically feasible, the latest 2 versions per platform and the previous `LTS`_.
->>>>>>> b2da03441... update supported linux platforms
+   For Linux distributions, we support, if technically feasible, the latest 2 versions per platform and the previous LTS.
  
  Installation Wizard
  -------------------
author	Bruno Perel <bperel@users.noreply.github.com>
	Sat, 29 Feb 2020 10:11:30 +0000 (11:11 +0100)
committer	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Mon, 2 Mar 2020 07:05:37 +0000 (08:05 +0100)