merge conflict

1 files changed, 1 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs
index 07958493d..58a695c10 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Test/MainWindow.xaml.cs
@@ -25,14 +25,7 @@ namespace Tango.Scripting.Test
     {
         public MainWindow()
         {
-            ScriptEditor.AssemblyCacheProgress += ScriptEditor_AssemblyCacheProgress;
-            ScriptEditor.LoadCachedAssemblies(new List<System.Reflection.Assembly>()
-            {
-                typeof(String).Assembly,
-                typeof(Enumerable).Assembly,
-                typeof(Form).Assembly,
-                typeof(System.Drawing.Point).Assembly
-            });
+            ScriptEditor.LoadingSymbolsProgress += ScriptEditor_AssemblyCacheProgress;
 
             InitializeComponent();
             DataContext = new MainWindowVM();