Skip to content
This repository has been archived by the owner on Feb 20, 2019. It is now read-only.

Commit

Permalink
correct tyop
Browse files Browse the repository at this point in the history
  • Loading branch information
Carla Schroder committed Jul 14, 2015
1 parent c626e6a commit 9723003
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions admin_manual/configuration_files/files_locking_transactional.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 9723003

Please sign in to comment.