summaryrefslogtreecommitdiff
path: root/lib/common/CommonException.txt
diff options
context:
space:
mode:
Diffstat (limited to 'lib/common/CommonException.txt')
-rw-r--r--lib/common/CommonException.txt3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/common/CommonException.txt b/lib/common/CommonException.txt
index 885a9197..05da2709 100644
--- a/lib/common/CommonException.txt
+++ b/lib/common/CommonException.txt
@@ -45,8 +45,6 @@ IOStreamGetLineNotEnoughDataToIgnore 37 Bad value passed to IOStreamGetLine::Ign
TempDirPathTooLong 38 Your temporary directory path is too long. Check the TMP and TEMP environment variables.
ArchiveBlockIncompleteRead 39 The Store Object Info File is too short or corrupted, and will be rewritten automatically when the next backup completes.
AccessDenied 40 Access to the file or directory was denied. Please check the permissions.
-<<<<<<< HEAD
-=======
DatabaseOpenFailed 41 Failed to open the database file
DatabaseReadFailed 42 Failed to read a record from the database file
DatabaseWriteFailed 43 Failed to write a record from the database file
@@ -57,4 +55,3 @@ DatabaseRecordAlreadyExists 47 The database already contains a record with this
DatabaseRecordBadSize 48 The database contains a record with an invalid size
DatabaseIterateFailed 49 Failed to iterate over the database keys
ReferenceNotFound 50 The database does not contain an expected reference
->>>>>>> 0.12