centersl/nextcloud-docs
1
0
Fork 0
mirror of https://github.com/nextcloud/documentation.git synced 2026-04-04 14:59:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

correct tyop

Browse Source
This commit is contained in:
Carla Schroder
2015-07-14 13:24:10 -07:00
parent c626e6ae44
commit 97230034c4
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_manual/configuration_files/files_locking_transactional.rst
View File

@@ -42,9 +42,7 @@ After installing Redis you must enter a simple configuration in your
//'dbindex' => 0,
),
The **Server status** section on your ownCloud Admin page indicates whether
<<<<<<< HEAD:admin_manual/configuration_files/files_locking_experimental.rst
experimental file locking is enabled or disabled.
The **Server status** section on your ownCloud Admin page indicates whether experimental file locking is enabled or disabled.
.. figure:: ../images/transactional-locking-1.png