From de514b47f502ace13335e2a432b896f16af55039 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 20 Dec 2017 10:17:08 +0200
Subject: MERGE.

---
 .../Tango.MachineStudio.Synchronization.csproj                   | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
index 53a0476e5..8b2f0ae82 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Navigation\NavigationView.cs" />
     <Compile Include="Navigation\SyncNavigationManager.cs" />
     <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\LocalSynchronizationViewVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
     <Compile Include="ViewModels\MenuViewVM.cs" />
     <Compile Include="Views\RemoteSynchronizationView.xaml.cs">
@@ -153,6 +154,14 @@
       <Project>{0ecd6da8-7aa6-48d9-8b65-279d176ad9af}</Project>
       <Name>Tango.DAL.Observables</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
       <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
       <Name>Tango.SharedUI</Name>
-- 
cgit v1.3.1