fix conflict

Rectify11 · Sep 27, 2023 · 3d18d74 · 3d18d74
1 parent f08a8a6
commit 3d18d74
Show file tree

Hide file tree

Showing 2 changed files with 188 additions and 182 deletions.
diff --git a/Rectify11.Phase2/Patches.cs b/Rectify11.Phase2/Patches.cs
@@ -6,113 +6,116 @@
 using System.Xml.Schema;
 using System.Xml.Serialization;
 
-#region Parser
-public class PatchesParser
+namespace Rectify11.Phase2
 {
-    #region Public Methods
-    public static Patches GetAll()
+    #region Parser
+    public class PatchesParser
     {
-        XmlSerializer ser = new XmlSerializer(typeof(Patches));
-        Patches patches;
-        using (var reader = new StringReader(Rectify11.Phase2.Properties.Resources.rectify11))
+        #region Public Methods
+        public static Patches GetAll()
         {
-            patches = (Patches)ser.Deserialize(reader);
+            XmlSerializer ser = new XmlSerializer(typeof(Patches));
+            Patches patches;
+            using (var reader = new StringReader(Rectify11.Phase2.Properties.Resources.rectify11))
+            {
+                patches = (Patches)ser.Deserialize(reader);
+            }
+            return patches;
         }
-        return patches;
+        #endregion
     }
     #endregion
-}
-#endregion
-#region Deserializer Class
+    #region Deserializer Class
 
-[GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-[SerializableAttribute()]
-[DebuggerStepThroughAttribute()]
-[DesignerCategoryAttribute("code")]
-[XmlTypeAttribute(AnonymousType = true)]
-[XmlRootAttribute(Namespace = "", IsNullable = false)]
-public partial class Patches
-{
-
-    private PatchesPatch[] itemsField;
-    [XmlElementAttribute("Patch", Form = XmlSchemaForm.Unqualified)]
-    public PatchesPatch[] Items
+    [GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [SerializableAttribute()]
+    [DebuggerStepThroughAttribute()]
+    [DesignerCategoryAttribute("code")]
+    [XmlTypeAttribute(AnonymousType = true)]
+    [XmlRootAttribute(Namespace = "", IsNullable = false)]
+    public partial class Patches
     {
-        get => this.itemsField;
-        set => this.itemsField = value;
-    }
-}
-
-[GeneratedCodeAttribute("xsd", "4.6.1055.0")]
-[SerializableAttribute()]
-[DebuggerStepThroughAttribute()]
-[DesignerCategoryAttribute("code")]
-[XmlTypeAttribute(AnonymousType = true)]
-public partial class PatchesPatch
-{
-    private string muiField;
-    private string maskField;
-    private string x86Field;
-    private string hardlinkTargetField;
-    private string disableOnSafeModeField;
-    private string IgnoreField;
-    private string MinVersionField;
-    private string MaxVersionField;
 
-    [XmlAttributeAttribute()]
-    public string Mui
-    {
-        get => this.muiField;
-        set => this.muiField = value;
+        private PatchesPatch[] itemsField;
+        [XmlElementAttribute("Patch", Form = XmlSchemaForm.Unqualified)]
+        public PatchesPatch[] Items
+        {
+            get => this.itemsField;
+            set => this.itemsField = value;
+        }
     }
 
-    [XmlAttributeAttribute()]
-    public string mask
+    [GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+    [SerializableAttribute()]
+    [DebuggerStepThroughAttribute()]
+    [DesignerCategoryAttribute("code")]
+    [XmlTypeAttribute(AnonymousType = true)]
+    public partial class PatchesPatch
     {
-        get => this.maskField;
-        set => this.maskField = value;
-    }
+        private string muiField;
+        private string maskField;
+        private string x86Field;
+        private string hardlinkTargetField;
+        private string disableOnSafeModeField;
+        private string IgnoreField;
+        private string MinVersionField;
+        private string MaxVersionField;
 
-    [XmlAttributeAttribute()]
-    public string x86
-    {
-        get => this.x86Field;
-        set => this.x86Field = value;
-    }
+        [XmlAttributeAttribute()]
+        public string Mui
+        {
+            get => this.muiField;
+            set => this.muiField = value;
+        }
 
-    [XmlAttributeAttribute()]
-    public string HardlinkTarget
-    {
-        get => this.hardlinkTargetField;
-        set => this.hardlinkTargetField = value;
-    }
+        [XmlAttributeAttribute()]
+        public string mask
+        {
+            get => this.maskField;
+            set => this.maskField = value;
+        }
 
-    [XmlAttributeAttribute()]
-    public string DisableOnSafeMode
-    {
-        get => this.disableOnSafeModeField;
-        set => this.disableOnSafeModeField = value;
-    }
+        [XmlAttributeAttribute()]
+        public string x86
+        {
+            get => this.x86Field;
+            set => this.x86Field = value;
+        }
 
-    [XmlAttributeAttribute()]
-    public string Ignore
-    {
-        get => this.IgnoreField;
-        set => this.IgnoreField = value;
-    }
+        [XmlAttributeAttribute()]
+        public string HardlinkTarget
+        {
+            get => this.hardlinkTargetField;
+            set => this.hardlinkTargetField = value;
+        }
 
-    [XmlAttributeAttribute()]
-    public string MinVersion
-    {
-        get => this.MinVersionField;
-        set => this.MinVersionField = value;
-    }
+        [XmlAttributeAttribute()]
+        public string DisableOnSafeMode
+        {
+            get => this.disableOnSafeModeField;
+            set => this.disableOnSafeModeField = value;
+        }
 
-    [XmlAttributeAttribute()]
-    public string MaxVersion
-    {
-        get => this.MaxVersionField;
-        set => this.MaxVersionField = value;
+        [XmlAttributeAttribute()]
+        public string Ignore
+        {
+            get => this.IgnoreField;
+            set => this.IgnoreField = value;
+        }
+
+        [XmlAttributeAttribute()]
+        public string MinVersion
+        {
+            get => this.MinVersionField;
+            set => this.MinVersionField = value;
+        }
+
+        [XmlAttributeAttribute()]
+        public string MaxVersion
+        {
+            get => this.MaxVersionField;
+            set => this.MaxVersionField = value;
+        }
     }
-}
-#endregion
+    #endregion
+}