merge conflict

1 files changed, 15 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs
new file mode 100644
index 000000000..4600460b7
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    public class RangeDescriptionModel
+    {
+        public String Description { get; set; }
+        public double Min { get; set; }
+        public double Max { get; set; }
+    }
+}