From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
index cc2c1fd46..0408319ea 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Console/ConsoleWindow.xaml
@@ -156,12 +156,12 @@
                                 <RowDefinition Height="200*"/>
                             </Grid.RowDefinitions>
 
-                            <!--<controls:ScriptEditorControl BorderThickness="0 1 0 0" 
+                            <controls:ScriptEditorControl BorderThickness="0 1 0 0" 
                                                           BorderBrush="#616161" 
                                                           Text="{Binding Code,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
                                                           RunCommand="{Binding RunCommand}" 
                                                           StopCommand="{Binding StopCommand}"  IntellisenseTypes="{Binding IntellisenseTypes}"
-                                                          HighlightTypes="{Binding HighlightTypes}"/>-->
+                                                          HighlightTypes="{Binding HighlightTypes}"/>
                             <GridSplitter Grid.Row="1" Background="{StaticResource DarkGrayBrush100}" Foreground="{StaticResource DarkGrayBrush200}" BorderBrush="{StaticResource DarkGrayBrush200}" Height="5" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
 
 
-- 
cgit v1.3.1