merge conflict

1 files changed, 3 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs
index 565949402..6bd3d44b9 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/ProjectSession.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Tango.Scripting.Basic
 {
-    public class ProjectSession
+    public class ProjectSession<T> where T : IContext
     {
         private Action _abortAction;
         private TaskCompletionSource<object> _completion;
@@ -15,9 +15,9 @@ namespace Tango.Scripting.Basic
 
         public ProjectSessionState State { get; set; }
 
-        public Project Project { get; set; }
+        public Project<T> Project { get; set; }
 
-        public ProjectSession(Project project, Action abortAction)
+        public ProjectSession(Project<T> project, Action abortAction)
         {
             _completion = new TaskCompletionSource<object>();
             Project = project;