From cc1738015067be756fb3a1025e3037617e450aa5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 27 Sep 2016 16:52:19 +0200 Subject: [PATCH] Oppsie Signed-off-by: Joas Schilling --- admin_manual/maintenance/upgrade.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/admin_manual/maintenance/upgrade.rst b/admin_manual/maintenance/upgrade.rst index d3bae85b3..1fe9fe29b 100644 --- a/admin_manual/maintenance/upgrade.rst +++ b/admin_manual/maintenance/upgrade.rst @@ -72,9 +72,3 @@ Nextcloud release. Any apps that are not developed by Nextcloud show a 3rd party designation. **Install unsupported apps at your own risk**. Then, before the upgrade, all 3rd party apps must be disabled. After the upgrade is complete you may re-enable them. -<<<<<<< HEAD - -.. nextcloud.com/install/: - https://nextcloud.com/install/ -======= ->>>>>>> d3d6ea5... Some more cleanup