zhao：解决冲突

XHPZ.Desktop/XHPZ.Desktop.csproj

@@ -84,16 +84,13 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-<<<<<<< HEAD
     <Page Include="PracticeWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-  </ItemGroup>
-  <ItemGroup>
     <Compile Include="PracticeWindow.xaml.cs">
       <DependentUpon>PracticeWindow.xaml</DependentUpon>
-=======
+    </Compile>
     <Page Include="MessageWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -102,7 +99,6 @@
   <ItemGroup>
     <Compile Include="MessageWindow.xaml.cs">
       <DependentUpon>MessageWindow.xaml</DependentUpon>
->>>>>>> a23bdc84b33a613a7ae65513fd285d36f24a5dd6
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>