Fixed merge issues

CoEST · May 7, 2018 · c32e7c5 · c32e7c5
1 parent 100b944
commit c32e7c5
Show file tree

Hide file tree

Showing 49 changed files with 57 additions and 66 deletions.
diff --git a/Main/Types/TraceLabSDK.Types.dll b/Main/Types/TraceLabSDK.Types.dll
diff --git a/Main/Types/TraceLabSDK.Types.pdb b/Main/Types/TraceLabSDK.Types.pdb
diff --git a/Main/WebService/Bin/TraceLab.Core.dll b/Main/WebService/Bin/TraceLab.Core.dll
diff --git a/Main/WebService/Bin/TraceLab.Core.pdb b/Main/WebService/Bin/TraceLab.Core.pdb
diff --git a/Main/WebService/Bin/TraceLab.dll b/Main/WebService/Bin/TraceLab.dll
diff --git a/Main/WebService/Bin/TraceLab.pdb b/Main/WebService/Bin/TraceLab.pdb
diff --git a/Main/WebService/Bin/TraceLabSDK.Types.dll b/Main/WebService/Bin/TraceLabSDK.Types.dll
diff --git a/Main/WebService/Bin/TraceLabSDK.Types.pdb b/Main/WebService/Bin/TraceLabSDK.Types.pdb
diff --git a/Main/WebService/Bin/TraceLabSDK.dll b/Main/WebService/Bin/TraceLabSDK.dll
diff --git a/Main/WebService/Bin/TraceLabSDK.pdb b/Main/WebService/Bin/TraceLabSDK.pdb
diff --git a/Main/WebService/Bin/TraceLabWeb.dll b/Main/WebService/Bin/TraceLabWeb.dll
diff --git a/Main/WebService/Bin/TraceLabWeb.pdb b/Main/WebService/Bin/TraceLabWeb.pdb
diff --git a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.csprojResolveAssemblyReference.cache
diff --git a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.dll b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.dll
diff --git a/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.pdb b/Main/WebService/TraceLab.Core/obj/Debug/TraceLab.Core.pdb
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll.CodeAnalysisLog.xml b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.dll.CodeAnalysisLog.xml
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLab.Core.pdb
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.dll b/Main/WebService/TraceLab/bin/Debug/TraceLab.dll
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLab.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLab.pdb
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.dll b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.dll
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.Types.pdb
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.dll b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.dll
diff --git a/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.pdb b/Main/WebService/TraceLab/bin/Debug/TraceLabSDK.pdb
diff --git a/Main/WebService/TraceLab/lib/TraceLabSDK.dll b/Main/WebService/TraceLab/lib/TraceLabSDK.dll
diff --git a/Main/WebService/TraceLab/lib/TraceLabSDK.pdb b/Main/WebService/TraceLab/lib/TraceLabSDK.pdb
diff --git a/Main/WebService/TraceLab/obj/Debug/TraceLab.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLab/obj/Debug/TraceLab.csprojResolveAssemblyReference.cache
diff --git a/Main/WebService/TraceLab/obj/Debug/TraceLab.dll b/Main/WebService/TraceLab/obj/Debug/TraceLab.dll
diff --git a/Main/WebService/TraceLab/obj/Debug/TraceLab.pdb b/Main/WebService/TraceLab/obj/Debug/TraceLab.pdb
diff --git a/...ervice/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.csprojResolveAssemblyReference.cache b/...ervice/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.csprojResolveAssemblyReference.cache
diff --git a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.dll b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.dll
diff --git a/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.pdb b/Main/WebService/TraceLabSDK.Types/obj/Debug/TraceLabSDK.Types.pdb
diff --git a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.dll b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.dll
diff --git a/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.pdb b/Main/WebService/TraceLabSDK/obj/Debug/TraceLabSDK.pdb
diff --git a/Main/WebService/TraceLabWeb/TraceLabApplicationWebConsole.cs b/Main/WebService/TraceLabWeb/TraceLabApplicationWebConsole.cs
@@ -89,18 +89,14 @@ public DataTable  GetNodesForDropdown()
             return WebConsoleUI.GetNodesForDropdown(); // TODO WebConsoleUI.GetNodes
         }
 
-<<<<<<< HEAD
-        public Dictionary<string, object> OpenExperiment(string path)
-=======
         public void newExperiment(string fpath)
         {
             //"C:\\Program Files (x86)\\COEST\\TraceLab\\Tutorials\\First experiment\\VectorSpaceStandardExperiment.teml"
             WebConsoleUI.NewExperiment(fpath);
         }
 
 
-        public void OpenExperiment(string path)
->>>>>>> c8835bdb0302cfa82198a4fef61fb3fd6474daa5
+        public Dictionary<string, object> OpenExperiment(string path)
         {
             //"C:\\Program Files (x86)\\COEST\\TraceLab\\Tutorials\\First experiment\\VectorSpaceStandardExperiment.teml"
             return WebConsoleUI.OpenExperiment(path);

diff --git a/Main/WebService/TraceLabWeb/WebConsoleUI.cs b/Main/WebService/TraceLabWeb/WebConsoleUI.cs
@@ -339,10 +339,6 @@ public static void DisplayHelp()
             log += ("\t?\t- This help message.<br />");
         }
 
-<<<<<<< HEAD
-        public static Dictionary<string, object> OpenExperiment(string value)
-=======
-
         public static void NewExperiment(string fpath)
         {
             //log = "";
@@ -374,8 +370,7 @@ public static void NewExperiment(string fpath)
 
 
 
-        public static void OpenExperiment(string value)
->>>>>>> c8835bdb0302cfa82198a4fef61fb3fd6474daa5
+        public static Dictionary<string, object> OpenExperiment(string value)
         {
             //log = "";
             Dictionary<string, object> info;

diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.dll
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.Core.pdb
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.dll
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLab.pdb
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.dll
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.Types.pdb
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.dll
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabSDK.pdb
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.dll b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.dll
diff --git a/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.pdb b/Main/WebService/TraceLabWeb/bin/Debug/TraceLabWeb.pdb
diff --git a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.csprojResolveAssemblyReference.cache b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.csprojResolveAssemblyReference.cache
diff --git a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.dll b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.dll
diff --git a/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.pdb b/Main/WebService/TraceLabWeb/obj/Debug/TraceLabWeb.pdb