merge conflict

1 files changed, 29 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Comparison/HardwareComponentCollectionCompareResult.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Comparison/HardwareComponentCollectionCompareResult.cs
new file mode 100644
index 000000000..c3c370f7a
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Comparison/HardwareComponentCollectionCompareResult.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+
+namespace Tango.MachineStudio.HardwareDesigner.Comparison
+{
+    public class HardwareComponentCollectionCompareResult
+    {
+        public String CollectionName { get; set; }
+
+        public SynchronizedObservableCollection<HardwareComponentCompareResult> Components { get; set; }
+
+        public bool HasDifferences
+        {
+            get
+            {
+                return Components.Any(item => item.HasDifferences);
+            }
+        }
+
+        public HardwareComponentCollectionCompareResult()
+        {
+            Components = new SynchronizedObservableCollection<HardwareComponentCompareResult>();
+        }
+    }
+}