merge conflicts

1 files changed, 53 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/ThreadLoading/ThreadLoadingState.cs b/Software/Visual_Studio/Tango.PMR/ThreadLoading/ThreadLoadingState.cs
new file mode 100644
index 000000000..5eca15290
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/ThreadLoading/ThreadLoadingState.cs
@@ -0,0 +1,53 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ThreadLoadingState.proto
+#pragma warning disable 1591, 0612, 3021
+#region Designer generated code
+
+using pb = global::Google.Protobuf;
+using pbc = global::Google.Protobuf.Collections;
+using pbr = global::Google.Protobuf.Reflection;
+using scg = global::System.Collections.Generic;
+namespace Tango.PMR.ThreadLoading {
+
+  /// <summary>Holder for reflection information generated from ThreadLoadingState.proto</summary>
+  public static partial class ThreadLoadingStateReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for ThreadLoadingState.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static ThreadLoadingStateReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChhUaHJlYWRMb2FkaW5nU3RhdGUucHJvdG8SF1RhbmdvLlBNUi5UaHJlYWRM",
+            "b2FkaW5nKo4BChJUaHJlYWRMb2FkaW5nU3RhdGUSCAoETm9uZRAAEg0KCVBy",
+            "ZXBhcmluZxABEhMKD1JlYWR5Rm9yTG9hZGluZxACEhQKEFByZXBhcmF0aW9u",
+            "RXJyb3IQAxIOCgpGaW5hbGl6aW5nEAQSFQoRRmluYWxpemF0aW9uRXJyb3IQ",
+            "BRINCglDb21wbGV0ZWQQBkIjCiFjb20udHdpbmUudGFuZ28ucG1yLnRocmVh",
+            "ZGxvYWRpbmdiBnByb3RvMw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ThreadLoading.ThreadLoadingState), }, null));
+    }
+    #endregion
+
+  }
+  #region Enums
+  public enum ThreadLoadingState {
+    [pbr::OriginalName("None")] None = 0,
+    [pbr::OriginalName("Preparing")] Preparing = 1,
+    [pbr::OriginalName("ReadyForLoading")] ReadyForLoading = 2,
+    [pbr::OriginalName("PreparationError")] PreparationError = 3,
+    [pbr::OriginalName("Finalizing")] Finalizing = 4,
+    [pbr::OriginalName("FinalizationError")] FinalizationError = 5,
+    [pbr::OriginalName("Completed")] Completed = 6,
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code