mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
b5ed352aa3
Only confluct resolution, do not compile or works Conflicts: CMakeLists.txt CPackConfig.cmake ConfigureChecks.cmake client/csync_client.c cmake/Modules/DefineCompilerFlags.cmake cmake/Modules/DefineInstallationPaths.cmake cmake/Modules/FindIconv.cmake cmake/Modules/FindIniparser.cmake cmake/Modules/FindNeon.cmake config.h.cmake config/CMakeLists.txt config/ocsync.conf doc/CMakeLists.txt modules/csync_owncloud.c modules/csync_sftp2.c src/CMakeLists.txt src/csync.c src/csync.h src/csync_config.c src/csync_exclude.c src/csync_lock.c src/csync_macros.h src/csync_misc.c src/csync_misc.h src/csync_private.h src/csync_propagate.c src/csync_statedb.c src/csync_statedb.h src/csync_update.c src/csync_util.c src/csync_util.h src/std/c_dir.c src/std/c_file.c src/std/c_private.h src/std/c_string.c src/std/c_string.h src/std/c_time.c src/vio/csync_vio.c src/vio/csync_vio.h src/vio/csync_vio_file_stat.h src/vio/csync_vio_local.c src/vio/csync_vio_method.h tests/CMakeLists.txt tests/csync_tests/check_csync_statedb_load.c tests/csync_tests/check_csync_statedb_query.c tests/csync_tests/check_csync_treewalk.c tests/csync_tests/check_csync_update.c tests/ownCloud/HTTP/DAV.pm tests/ownCloud/ownCloud/Test.pm tests/std_tests/check_std_c_str.c tests/vio_tests/check_vio.c
16 lines
361 B
Text
16 lines
361 B
Text
# max diff time between two recplicas in seconds
|
|
max_time_difference = 10
|
|
|
|
# max directory depth recursion
|
|
max_depth = 50
|
|
|
|
# NOT IN USE:
|
|
# sync symbolic links if the remote filesystem supports it.
|
|
#sync_symbolic_links = false
|
|
|
|
# connection timeout in seconds
|
|
timeout = 30
|
|
|
|
# create a copy for backup for the file which has a conflict
|
|
with_confilct_copies = no
|
|
|