diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-10 11:35:53 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-10 11:35:53 +0100 |
| commit | c7693e1f24803c4febdd63ccd3fe79533019f7d4 (patch) | |
| tree | a216f67248ad8f530cfb3aef3789150d3aca0316 /dbaccess/source/core/inc/core_resource.hrc | |
| parent | c66201b66deeb77d630a583557c41f8b9b7381bd (diff) | |
dba33d: merge
Diffstat (limited to 'dbaccess/source/core/inc/core_resource.hrc')
| -rw-r--r-- | dbaccess/source/core/inc/core_resource.hrc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index cdcdfbd87107..b0c4536782fe 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -88,7 +88,6 @@ #define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 ) #define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 ) #define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 ) -<<<<<<< local #define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) #define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) @@ -111,9 +110,7 @@ #define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) #define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) -======= -#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 48 ) ->>>>>>> other +#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) #endif // _DBA_CORE_RESOURCE_HRC_ |