merge conflicts -take remote

1 files changed, 14 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.FileSystem/Network/CreateFolderRequest.cs b/Software/Visual_Studio/Tango.FileSystem/Network/CreateFolderRequest.cs
new file mode 100644
index 000000000..77452dcdf
--- /dev/null
+++ b/Software/Visual_Studio/Tango.FileSystem/Network/CreateFolderRequest.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FileSystem.Network
+{
+    public class CreateFolderRequest
+    {
+        public String Path { get; set; }
+        public String FolderName { get; set; }
+    }
+}