resolved conflicts

1 files changed, 28 insertions, 0 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs
index 328dbb492..54431bdbe 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/SQL/RemoteSqlColumn.cs
@@ -6,19 +6,47 @@ using System.Threading.Tasks;
 
 namespace Tango.PPC.Shared.SQL
 {
+    /// <summary>
+    /// Represents a <see cref="RemoteSqlDataSet"/> column.
+    /// </summary>
     public class RemoteSqlColumn
     {
+        /// <summary>
+        /// Gets or sets the column name.
+        /// </summary>
         public String Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the column index.
+        /// </summary>
         public int Index { get; set; }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteSqlColumn"/> class.
+        /// </summary>
         public RemoteSqlColumn()
         {
 
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteSqlColumn"/> class.
+        /// </summary>
+        /// <param name="name">The column name.</param>
         public RemoteSqlColumn(String name)
         {
             Name = name;
         }
+
+        /// <summary>
+        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String" /> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            return Name;
+        }
     }
 }