# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/build_publish_release_docker_image.yml
#	CONTRIBUTING.md
#	MANUAL.html
#	MANUAL.txt
#	Makefile
#	RELEASE.md
#	backend/all/all.go
#	backend/b2/b2.go
#	backend/b2/b2_internal_test.go
#	backend/box/box.go
#	backend/cache/cache_internal_test.go
#	backend/drive/metadata.go
#	backend/dropbox/dropbox.go
#	backend/googlephotos/googlephotos.go
#	backend/hidrive/hidrive.go
#	backend/local/about_windows.go
#	backend/onedrive/metadata.go
#	backend/onedrive/onedrive.go
#	backend/oracleobjectstorage/multipart.go
#	backend/pikpak/helper.go
#	backend/pikpak/pikpak.go
#	backend/premiumizeme/premiumizeme.go
#	backend/putio/putio.go
#	backend/s3/s3_internal_test.go
#	backend/s3/s3_test.go
#	backend/sharefile/sharefile.go
#	backend/sugarsync/sugarsync.go
#	backend/swift/swift.go
#	backend/yandex/yandex.go
#	backend/zoho/zoho.go
#	cmd/bisync/bilib/output.go
#	cmd/bisync/cmd.go
#	cmd/bisync/listing.go
#	cmd/cat/cat.go
#	cmd/cmd.go
#	cmd/dedupe/dedupe.go
#	cmd/genautocomplete/genautocomplete_bash.go
#	cmd/genautocomplete/genautocomplete_fish.go
#	cmd/genautocomplete/genautocomplete_powershell.go
#	cmd/genautocomplete/genautocomplete_zsh.go
#	cmd/gendocs/gendocs.go
#	cmd/help.go
#	cmd/listremotes/listremotes.go
#	cmd/mountlib/mount.go
#	cmd/mountlib/rc.go
#	cmd/nfsmount/nfsmount_test.go
#	cmd/rcat/rcat.go
#	cmd/rcd/rcd.go
#	cmd/serve/dlna/dlna.go
#	cmd/serve/dlna/dlnaflags/dlnaflags.go
#	cmd/serve/docker/driver.go
#	cmd/serve/docker/options.go
#	cmd/serve/ftp/ftp.go
#	cmd/serve/http/http.go
#	cmd/serve/nfs/filesystem.go
#	cmd/serve/nfs/handler.go
#	cmd/serve/nfs/nfs.go
#	cmd/serve/proxy/proxy.go
#	cmd/serve/proxy/proxy_test.go
#	cmd/serve/s3/s3.go
#	cmd/serve/s3/s3_test.go
#	cmd/serve/s3/server.go
#	cmd/serve/sftp/connection.go
#	cmd/serve/sftp/server.go
#	cmd/serve/sftp/sftp.go
#	cmd/serve/webdav/webdav.go
#	cmd/siginfo_bsd.go
#	cmd/test/info/internal/build_csv/main.go
#	cmd/test/makefiles/makefiles.go
#	docs/content/oracleobjectstorage.md
#	fs/accounting/stats_groups_test.go
#	fs/chunkedreader/chunkedreader.go
#	fs/chunkedreader/chunkedreader_test.go
#	fs/config/config_read_password.go
#	fs/config/configfile/configfile.go
#	fs/config/configflags/configflags.go
#	fs/filter/filter.go
#	fs/filter/filterflags/filterflags.go
#	fs/hash/hash_test.go
#	fs/log.go
#	fs/log/logflags/logflags.go
#	fs/log/redirect_stderr_unix.go
#	fs/operations/copy.go
#	fs/operations/operations.go
#	fs/operations/operations_test.go
#	fs/rc/jobs/job_test.go
#	fs/rc/rc.go
#	fs/rc/rcflags/rcflags.go
#	fs/rc/rcserver/rcserver.go
#	fs/rc/rcserver/rcserver_test.go
#	fs/rc/webgui/plugins.go
#	fs/rc/webgui/rc_test.go
#	fs/registry.go
#	fstest/fstest.go
#	fstest/test_all/config.go
#	fstest/test_all/test_all.go
#	lib/encoder/internal/gen/main.go
#	lib/http/auth.go
#	lib/http/server.go
#	lib/http/template.go
#	lib/pool/pool.go
#	lib/pool/reader_writer_test.go
#	lib/systemd/notify.go
#	rclone.1
#	vfs/rc.go
#	vfs/test_vfs/test_vfs.go
#	vfs/vfscache/cache_test.go
#	vfs/vfsflags/vfsflags.go
#	vfs/vfsflags/vfsflags_unix.go
#	vfs/vfstest/file.go
#	vfs/vfstest/fs.go
#	vfs/vfstest/submount.go

# Conflicts:
#	.github/workflows/build_publish_beta_docker_image.yml
#	.github/workflows/build_publish_release_docker_image.yml
#	Dockerfile
#	backend/azureblob/azureblob.go
#	backend/b2/b2.go
#	backend/cache/cache.go
#	backend/combine/combine.go
#	backend/compress/compress.go
#	backend/crypt/crypt.go
#	backend/drive/drive.go
#	backend/gofile/gofile.go
#	backend/googlecloudstorage/googlecloudstorage.go
#	backend/hasher/hasher.go
#	backend/iclouddrive/api/session.go
#	backend/jottacloud/jottacloud.go
#	backend/memory/memory.go
#	backend/netstorage/netstorage.go
#	backend/onedrive/onedrive.go
#	backend/oracleobjectstorage/oracleobjectstorage.go
#	backend/pcloud/pcloud.go
#	backend/qingstor/qingstor.go
#	backend/s3/s3.go
#	backend/smb/connpool.go
#	backend/swift/swift.go
#	cmd/all/all.go
#	cmd/gitannex/e2e_test.go
#	cmd/gitannex/gitannex_test.go
#	cmd/nfsmount/nfsmount_test.go
#	cmd/progress.go
#	cmd/serve/dlna/dlna.go
#	cmd/serve/dlna/dlna_test.go
#	cmd/serve/dlna/dlnaflags/dlnaflags.go
#	cmd/serve/docker/docker.go
#	cmd/serve/ftp/ftp.go
#	cmd/serve/ftp/ftp_test.go
#	cmd/serve/http/http.go
#	cmd/serve/http/http_test.go
#	cmd/serve/nfs/cache_test.go
#	cmd/serve/nfs/nfs.go
#	cmd/serve/proxy/proxy_test.go
#	cmd/serve/restic/restic.go
#	cmd/serve/restic/restic_test.go
#	cmd/serve/s3/s3.go
#	cmd/serve/s3/s3_test.go
#	cmd/serve/s3/server.go
#	cmd/serve/serve.go
#	cmd/serve/servetest/servetest.go
#	cmd/serve/sftp/server.go
#	cmd/serve/sftp/sftp.go
#	cmd/serve/sftp/sftp_test.go
#	cmd/serve/webdav/webdav.go
#	cmd/serve/webdav/webdav_test.go
#	docs/content/faq.md
#	fs/accounting/stats_groups_test.go
#	fs/list/list.go
#	fs/log/caller_hook.go
#	fs/log/log.go
#	fs/march/march.go
#	fs/march/march_test.go
#	fs/operations/check_test.go
#	fs/operations/lsjson.go
#	fs/walk/walk.go
#	lib/file/mkdir_windows_go122_test.go
#	lib/pool/pool.go
#	lib/pool/pool_test.go
#	vfs/dir.go
#	vfs/file.go
#	vfs/vfs.go
#	vfs/vfscache/writeback/writeback_test.go