Fix git merge hiccup

This commit is contained in:
Bruno Perel 2020-02-29 11:11:30 +01:00 committed by Roeland Jago Douma
parent 68ee513bd0
commit 7378ae6a7f
1 changed files with 1 additions and 2 deletions

View File

@ -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
-------------------