충돌 수정 완료
parent
b4468e40e5
commit
a7b9f713d7
|
@ -513,10 +513,6 @@
|
||||||
<DependentUpon>DialogFormLogOn.cs</DependentUpon>
|
<DependentUpon>DialogFormLogOn.cs</DependentUpon>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="DialogForms\DialogFormPasswordKeyPad1.resx">
|
|
||||||
<DependentUpon>DialogFormPasswordKeyPad1.cs</DependentUpon>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="DialogForms\DialogFormMessage.resx">
|
<EmbeddedResource Include="DialogForms\DialogFormMessage.resx">
|
||||||
<DependentUpon>DialogFormMessage.cs</DependentUpon>
|
<DependentUpon>DialogFormMessage.cs</DependentUpon>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
|
@ -525,10 +521,6 @@
|
||||||
<DependentUpon>DialogFormNumKeyPad.cs</DependentUpon>
|
<DependentUpon>DialogFormNumKeyPad.cs</DependentUpon>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="DialogForms\DialogFormPasswordKeyPad.resx">
|
|
||||||
<DependentUpon>DialogFormPasswordKeyPad.cs</DependentUpon>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="DialogForms\DialogFormKeyboard.resx">
|
<EmbeddedResource Include="DialogForms\DialogFormKeyboard.resx">
|
||||||
<DependentUpon>DialogFormKeyboard.cs</DependentUpon>
|
<DependentUpon>DialogFormKeyboard.cs</DependentUpon>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
|
|
Loading…
Reference in New Issue