diff options
| author | Bruno Perel <bperel@users.noreply.github.com> | 2020-02-29 13:11:30 +0300 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-02 10:05:37 +0300 |
| commit | 7378ae6a7ff4d8e53aa7fc1030e3b4e34b680e67 (patch) | |
| tree | f78841483fc3e09bf9d561290af28f40e3b57323 /doc | |
| parent | 68ee513bd096b52b1b0b9b31dbe7971e06898512 (diff) | |
Fix git merge hiccup
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/installing.rst | 3 |
1 files changed, 1 insertions, 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 ------------------- |