解决冲突

XplorePlane/Views/Main/MainWindow.xaml

@@ -65,8 +65,7 @@
                 Header="主页">
                 <telerik:RadRibbonGroup
                     telerik:ScreenTip.Title="Clipboard"
-                    Header="文件"
-                    >
+                    Header="文件">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
                     </telerik:RadRibbonGroup.Variants>
@@ -344,8 +343,8 @@
           Size="Large"
           SmallImage="/Assets/Icons/message.png"
           Text="检测记录" />
-                  
-<!--
+
+                    <!--
                     <StackPanel>
                         <telerik:RadRibbonButton
                             telerik:ScreenTip.Title="参考点"
@@ -417,8 +416,6 @@
                         Size="Large"
                         SmallImage="/Assets/Icons/Pores.png" />
                 </telerik:RadRibbonGroup>
-
-                
             </telerik:RadRibbonTab>
 
             <telerik:RadRibbonTab Header="3D扫描">
@@ -537,11 +534,6 @@
                            Text="坐标标定" />
                     </StackPanel>
                 </telerik:RadRibbonGroup>
-<<<<<<< HEAD
-                
-                
-                
-=======
                 <telerik:RadRibbonGroup
                 telerik:ScreenTip.Description="Show the Alignment tab of the Format Cells dialog box."
                 telerik:ScreenTip.Title="Format Cells: Alignment"
@@ -582,8 +574,6 @@
                          Text="拟合圆" />
                     </StackPanel>
                 </telerik:RadRibbonGroup>
-
->>>>>>> TURBO-615-RecognitionAndPositioning
                 <telerik:RadRibbonGroup Header="多语言">
                     <telerik:RadRibbonGroup.Variants>
                         <telerik:GroupVariant Priority="0" Variant="Large" />
@@ -595,7 +585,6 @@
                         SmallImage="/Assets/Icons/tools.png"
                         Command="{Binding OpenLanguageSwitcherCommand}"
                         Text="语言设置" />
-   
                 </telerik:RadRibbonGroup>
 
                 <telerik:RadRibbonGroup Header="日志">
@@ -730,4 +719,4 @@
             </Grid>
         </Border>
     </Grid>
-</Window>
+</Window>