Merge branch 'ui-localisation' into translation

Yuubari · Apr 15, 2017 · 8024ee2 · 8024ee2
2 parents b410909 + 1f33637
commit 8024ee2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.csproj b/source/Grabacr07.KanColleViewer.Controls/KanColleViewer.Controls.csproj
@@ -47,7 +47,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\LivetCask.1.3.1.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>

diff --git a/source/Grabacr07.KanColleViewer/ViewModels/Settings/SettingsViewModel.cs b/source/Grabacr07.KanColleViewer/ViewModels/Settings/SettingsViewModel.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics.Eventing.Reader;
 using System.Linq;
-using System.Threading.Tasks;
 using Grabacr07.KanColleViewer.Composition;
 using Grabacr07.KanColleViewer.Models;
 using Grabacr07.KanColleViewer.Models.Settings;
@@ -13,7 +12,6 @@
 using Livet;
 using Livet.EventListeners;
 using MetroTrilithon.Mvvm;
-using Livet;
 
 namespace Grabacr07.KanColleViewer.ViewModels.Settings
 {