diff options
Diffstat (limited to 'lib/backupclient/BackupClientRestore.h')
| -rw-r--r-- | lib/backupclient/BackupClientRestore.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/backupclient/BackupClientRestore.h b/lib/backupclient/BackupClientRestore.h index 79765f63..77f09c2e 100644 --- a/lib/backupclient/BackupClientRestore.h +++ b/lib/backupclient/BackupClientRestore.h @@ -24,15 +24,6 @@ enum int BackupClientRestore(BackupProtocolClient &rConnection, int64_t DirectoryID, -<<<<<<< HEAD - const char *RemoteDirectoryName, - const char *LocalDirectoryName, - bool PrintDots = false, - bool RestoreDeleted = false, - bool UndeleteAfterRestoreDeleted = false, - bool Resume = false, - bool ContinueAfterErrors = false); -======= const std::string& RemoteDirectoryName, const std::string& LocalDirectoryName, bool PrintDots, @@ -40,7 +31,6 @@ int BackupClientRestore(BackupProtocolClient &rConnection, bool UndeleteAfterRestoreDeleted, bool Resume, bool ContinueAfterErrors); ->>>>>>> 0.12 #endif // BACKUPSCLIENTRESTORE__H |