From 7378ae6a7ff4d8e53aa7fc1030e3b4e34b680e67 Mon Sep 17 00:00:00 2001 From: Bruno Perel Date: Sat, 29 Feb 2020 11:11:30 +0100 Subject: [PATCH] Fix git merge hiccup --- doc/installing.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/installing.rst b/doc/installing.rst index 752207c46..c3be14073 100644 --- 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 ------------------- -- 2.30.2