冲突

ningshuxia

2023-02-24 e50c542be425a509c07dceeb7477958bb2e20509

冲突

 WinFormUI/IStation.WinFormUI.Project/IStation.WinFormUI.Project.csproj

@@ -117,7 +117,6 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Properties\licenses.licx" />
    <EmbeddedResource Include="project\CreateProjectDlg.resx">
      <DependentUpon>CreateProjectDlg.cs</DependentUpon>
    </EmbeddedResource>

 WinFormUI/IStation.WinFormUI.Scene/IStation.WinFormUI.Scene.csproj

@@ -101,7 +101,6 @@
    <EmbeddedResource Include="import\general\WaitGeneralDataImportDlg.resx">
      <DependentUpon>WaitGeneralDataImportDlg.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Properties\licenses.licx" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>