[Pkg-owncloud-commits] [owncloud-client] 33/47: Removed not expected whitespace.
Sandro Knauß
hefee-guest at moszumanska.debian.org
Mon Feb 17 18:06:34 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 86e90451fa6117c1b08cace48667c9a52782bc57
Author: Klaas Freitag <freitag at owncloud.com>
Date: Wed Feb 12 13:47:05 2014 +0100
Removed not expected whitespace.
---
doc/architecture.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/architecture.rst b/doc/architecture.rst
index 7098a08..4099bba 100644
--- a/doc/architecture.rst
+++ b/doc/architecture.rst
@@ -123,7 +123,7 @@ database. If the ETag is still the same, the file has not changed.
In case a file has changed on both, the local and the remote repository since
the last sync run, it can not easily be decided which version of the file is
- the one that should be used. However, changes to any side must not be lost.
+the one that should be used. However, changes to any side must not be lost.
That is called a **conflict case**. The client solves it by creating a conflict
file of the older of the two files and save the newer one under the original
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list