merge conflict

1 files changed, 17 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Report/ReportModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Report/ReportModel.cs
new file mode 100644
index 000000000..8f644ceee
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Report/ReportModel.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.HardwareDesigner.Report
+{
+    public class ReportModel
+    {
+        public String Collection { get; set; }
+        public String Component { get; set; }
+        public String Property { get; set; }
+        public String HW_1 { get; set; }
+        public String HW_2 { get; set; }
+    }
+}