merge conflict

2 files changed, 27 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProject.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProject.cs
index 700e04f7d..2e7ba6cf7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProject.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Project/MachineTechViewProject.cs
@@ -10,11 +10,18 @@ namespace Tango.MachineStudio.Technician.Project
 {
     public class MachineTechViewProject
     {
+
+#warning This is legacy and should be removed
         public List<TechItem> Items { get; set; }
 
+        public List<MachineTechViewProjectTab> Tabs { get; set; }
+
+        public int SelectedTabIndex { get; set; }
+
         public MachineTechViewProject()
         {
             Items = new List<TechItem>();
+            Tabs = new List<MachineTechViewProjectTab>();
         }
 
         public void Save(String fileName)
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>();
+        }
+    }
+}