merge conflict

1 files changed, 20 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProjectTab.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProjectTab.cs
new file mode 100644
index 000000000..c86e1ae55
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProjectTab.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.MachineStudio.Technician.TechItems;
+
+namespace Tango.MachineStudio.Technician.Project
+{
+    public class MachineTechViewProjectTab
+    {
+        public String Name { get; set; }
+        public List<TechItem> Items { get; set; }
+
+        public MachineTechViewProjectTab()
+        {
+            Items = new List<TechItem>();
+        }
+    }
+}