diff options
| author | Oren Novotny <oren@novotny.org> | 2019-02-07 19:21:26 -0500 |
|---|---|---|
| committer | Oren Novotny <oren@novotny.org> | 2019-02-07 19:21:26 -0500 |
| commit | 2b5d6ede17602d5adb07484943f5501e387ead36 (patch) | |
| tree | b7f7961538f72c787459bfb5dcf06e09ee165755 /crypto | |
| parent | merge from master (diff) | |
| download | BouncyCastle.NET-ed25519-2b5d6ede17602d5adb07484943f5501e387ead36.tar.xz | |
Fix merge bug
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/src/cmp/CmpException.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/src/cmp/CmpException.cs b/crypto/src/cmp/CmpException.cs index 7573c034f..6594e8f2a 100644 --- a/crypto/src/cmp/CmpException.cs +++ b/crypto/src/cmp/CmpException.cs @@ -18,6 +18,5 @@ namespace Org.BouncyCastle.Cmp : base(message, innerException) { } -#endif } } |