From: Bruno Perel <bperel@users.noreply.github.com>
Date: Sat, 29 Feb 2020 10:11:30 +0000 (+0100)
Subject: Fix git merge hiccup
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~339
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7378ae6a7ff4d8e53aa7fc1030e3b4e34b680e67;p=nextcloud-desktop.git

Fix git merge hiccup
---

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