diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-05-30 11:55:12 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-05-30 11:55:12 +0000 |
| commit | 670c33b8d161330cff009bcaf8163094930dc446 (patch) | |
| tree | 70368a2db38bab95e2376e8975a5fff19dae6c66 | |
| parent | 497294e8d03a4440d63fc5773e3e5eb92a1fd052 (diff) | |
remove merge markers
| -rw-r--r-- | lasso/errors.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lasso/errors.h b/lasso/errors.h index 48153e9d..8a99b477 100644 --- a/lasso/errors.h +++ b/lasso/errors.h @@ -145,13 +145,10 @@ /* WSF Profile */ #define LASSO_WSF_PROFILE_ERROR_MISSING_CORRELATION -1100 #define LASSO_WSF_PROFILE_ERROR_MISSING_SECURITY -1101 -<<<<<<< HEAD:lasso/errors.h -======= #define LASSO_WSF_PROFILE_ERROR_MISSING_ASSERTION_ID -1102 /* AssertionID attribute is missing */ #define LASSO_WSF_PROFILE_ERROR_MISSING_ENDPOINT -1103 #define LASSO_WSF_PROFILE_ERROR_SOAP_FAULT 1104 #define LASSO_WSF_PROFILE_ERROR_UNSUPPORTED_SECURITY_MECHANISM 1105 ->>>>>>> ba6d13d... * Move error message inside comments in lasso/errors.h:lasso/errors.h /* ID-WSF 2 Discovery */ #define LASSO_DISCOVERY_ERROR_SVC_METADATA_REGISTER_FAILED -1200 /* Service metadata registration failed */ |