diff options
| author | EgorBo <egorbo@gmail.com> | 2018-04-14 10:06:11 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-04-14 10:14:56 +0300 |
| commit | ce363c3cadac3d5ea85092b202639c418d0b3e9a (patch) | |
| tree | 7734ede97eeec369d352848fa7a2af326e68525a /src/System.Private.Xml | |
| parent | d53186aab92f06eddd422f2862bfd9679d20ff54 (diff) | |
remove merge marker, fix CS0177: The out parameter 'dto' must be assigned to before control leaves
Diffstat (limited to 'src/System.Private.Xml')
| -rw-r--r-- | src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs b/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs index 7b040816aa..4c2e761127 100644 --- a/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs +++ b/src/System.Private.Xml/src/System/Xml/Xslt/XsltException.cs @@ -147,10 +147,9 @@ namespace System.Xml.Xsl } [Serializable] -<<<<<<< HEAD -======= +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] ->>>>>>> upstream/master +#endif public class XsltCompileException : XsltException { protected XsltCompileException(SerializationInfo info, StreamingContext context) : base(info, context) |