From 0cb8e34f9a4914d1cceea7e51f849d7a2df146b2 Mon Sep 17 00:00:00 2001
From: Clicia Scarlet <yuyuvn@mac.com>
Date: Mon, 10 Feb 2014 16:17:32 +0700
Subject: [PATCH] Fix merge d04108b32fbec162e14b330b140beca12ddb3b33
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sót 1 file <(_ _)>
---
 .../Views/MainContent.xaml                    | 107 ------------------
 1 file changed, 107 deletions(-)

diff --git a/Grabacr07.KanColleViewer/Views/MainContent.xaml b/Grabacr07.KanColleViewer/Views/MainContent.xaml
index e6fa77845..4416a9385 100644
--- a/Grabacr07.KanColleViewer/Views/MainContent.xaml
+++ b/Grabacr07.KanColleViewer/Views/MainContent.xaml
@@ -51,7 +51,6 @@
                     </metro:TabView.Template>
                 </metro:TabView>
 
-<<<<<<< HEAD
                 <Rectangle Grid.Column="1"
 						   Width="1"
 						   Margin="10,5"
@@ -123,110 +122,4 @@
             </Grid>
         </ScrollViewer>
     </Grid>
-=======
-			<StackPanel Grid.Column="1"
-						Orientation="Horizontal"
-						Margin="10,0">
-				<controls:MuteButton Padding="10,5"
-									 Margin="6,0"
-									 Width="50"
-									 Height="38"
-									 DataContext="{Binding Volume}"
-									 IsMute="{Binding IsMute, Mode=OneWay}"
-									 MethodName="ToggleMute" />
-
-				<metro2:CallMethodButton Padding="10,5"
-										 Margin="6,0"
-										 Width="50"
-										 Height="38"
-										 MethodTarget="{Binding Source={x:Static root:App.ViewModelRoot}}"
-										 MethodName="TakeScreenshot">
-					<Viewbox>
-						<Path Data="M54.443001,31.656001 C43.397305,31.656 34.443001,40.610305 34.443002,51.656 34.443001,62.701694 43.397305,71.656 54.443001,71.656 65.488695,71.656 74.443001,62.701694 74.443001,51.656 74.443001,40.610305 65.488695,31.656 54.443001,31.656001 z M8.9445,0 L44.722501,0 44.722501,13.41675 107.334,13.41675 107.334,89.445002 0,89.445002 0,13.41675 8.9445,13.41675 z"
-							  Stretch="Uniform"
-							  Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}, Path=Foreground}" />
-					</Viewbox>
-				</metro2:CallMethodButton>
-			</StackPanel>
-		</Grid>
-
-		<!--<Border Grid.Row="1"
-				Background="#FFFFFFA0">
-			<TextBlock Text="所属艦娘の数が上限に達しています！"
-					   FontSize="14"
-					   Foreground="Black"
-					   Margin="20, 5" />
-		</Border>-->
-
-		<Grid Grid.Row="2">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-
-			<ScrollViewer VerticalScrollBarVisibility="Auto">
-				<Grid MinWidth="100"
-					  Background="{DynamicResource ActiveBackgroundBrushKey}">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-						<RowDefinition Height="Auto" />
-					</Grid.RowDefinitions>
-
-					<metro:TabView ItemsSource="{Binding TabItems}"
-								   SelectedValue="{Binding SelectedItem}" />
-
-					<Rectangle Grid.Row="1"
-							   Height="1"
-							   Margin="20,10"
-							   Fill="{DynamicResource InactiveForegroundBrushKey}"
-							   Opacity="0.5" />
-
-					<metro:TabView Grid.Row="2"
-								   ItemsSource="{Binding SystemTabItems}"
-								   SelectedValue="{Binding SelectedItem}"
-								   Margin="0,0,0,20" />
-				</Grid>
-			</ScrollViewer>
-
-			<ScrollViewer Grid.Column="1"
-						  VerticalScrollBarVisibility="Auto"
-						  VerticalAlignment="Top">
-				<ContentControl DataContext="{Binding SelectedItem}"
-								Content="{Binding}"
-								MinHeight="{Binding Source={x:Static properties:Settings.Default}, Path=UIContentHight}">
-					<ContentControl.Resources>
-						<DataTemplate DataType="{x:Type vmContents:OverviewViewModel}">
-							<contents:Overview />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vmFleets:FleetsViewModel}">
-							<views:Fleets />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vmDocks:RepairyardViewModel}">
-							<contents:Repairyard />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vmDocks:DockyardViewModel}">
-							<contents:Dockyard />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vmContents:QuestsViewModel}">
-							<contents:Quests />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vmContents:ExpeditionsViewModel}">
-							<contents:Expeditions />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vmContents:RankingsViewModel}">
-							<contents:Rankings />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type vm:SettingsViewModel}">
-							<settings:Settings />
-						</DataTemplate>
-						<DataTemplate DataType="{x:Type devVm:DebugTabViewModel}">
-							<dev:DebugTab />
-						</DataTemplate>
-					</ContentControl.Resources>
-				</ContentControl>
-			</ScrollViewer>
-		</Grid>
-	</Grid>
->>>>>>> 63338534c7531b0b9fe1b2d220a5393dda7a9498
 </UserControl>
\ No newline at end of file