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