Conflicts: Rename BasePath to InitialBasePath #6709
authorChristian Kamm <mail@ckamm.de>
Tue, 21 Aug 2018 09:24:45 +0000 (11:24 +0200)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:58:05 +0000 (10:58 +0100)
commit6b571b609c46b33f577ccb7b0813988cd096e9ba
tree04977755fecbc418a3b2e10cd4c058e8cb3b54be
parentd81ccbb0c1b34d4e73ddc3e8db8c45b9ee77f794
Conflicts: Rename BasePath to InitialBasePath #6709
src/common/syncjournaldb.cpp
src/common/syncjournalfilerecord.h
src/libsync/owncloudpropagator.cpp
src/libsync/propagatedownload.cpp
src/libsync/propagateupload.cpp
src/libsync/syncengine.cpp
test/testsyncconflict.cpp