aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-03-13 10:56:17 +0200
committerShlomo Hecht <shlomo@twine-s.com>2019-03-13 10:56:17 +0200
commit8df72202be31480ecd82d475523a8708c34ebd53 (patch)
tree7cb865092804e8a224cc7e15a525d2d960c0b462 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
parentce5f4c3f8e985095fa287d41cefef86b97f0a76d (diff)
parentf220013b518c49989ded8be13e12bfa82837f634 (diff)
downloadTango-8df72202be31480ecd82d475523a8708c34ebd53.tar.gz
Tango-8df72202be31480ecd82d475523a8708c34ebd53.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
index 7fbb0008c..3fffd69fd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs
@@ -61,7 +61,6 @@ namespace Tango.MachineStudio.UI
TangoIOC.Default.Unregister<INavigationManager>();
TangoIOC.Default.Unregister<IStudioModuleLoader>();
TangoIOC.Default.Unregister<IStudioApplicationManager>();
- TangoIOC.Default.Unregister<ExternalBridgeScanner>();
TangoIOC.Default.Unregister<IVideoCaptureProvider>();
TangoIOC.Default.Unregister<IDiagnosticsFrameProvider>();
TangoIOC.Default.Unregister<IEventLogger>();
@@ -79,7 +78,6 @@ namespace Tango.MachineStudio.UI
TangoIOC.Default.Register<INavigationManager, DefaultNavigationManager>();
TangoIOC.Default.Register<IStudioModuleLoader, DefaultStudioModuleLoader>();
TangoIOC.Default.Register<IStudioApplicationManager, DefaultStudioApplicationManager>();
- TangoIOC.Default.Register<ExternalBridgeScanner, ExternalBridgeScanner>();
TangoIOC.Default.Register<IVideoCaptureProvider, DefaultVideoCaptureProvider>();
TangoIOC.Default.Register<IDiagnosticsFrameProvider, DefaultDiagnosticsFrameProvider>();
TangoIOC.Default.Register<IEventLogger, DefaultEventLogger>();