diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-01 10:15:05 +0100 |
| commit | a8bf32646b66951eef7f2e8477d83d4d3f013a87 (patch) | |
| tree | 2659eea01895a4077c743aed399aff5631ba9b46 /TimeHACK.Main/TimeHACK.Main.csproj | |
| parent | e557e46076e0fe44fb03633665ae40c7d7444461 (diff) | |
| parent | 93c445239c7d28a6cee7147d7b6dbe3c7f0974f9 (diff) | |
| download | histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.gz histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.tar.bz2 histacom2-a8bf32646b66951eef7f2e8477d83d4d3f013a87.zip | |
Trying to fix the conflicts
Diffstat (limited to 'TimeHACK.Main/TimeHACK.Main.csproj')
| -rw-r--r-- | TimeHACK.Main/TimeHACK.Main.csproj | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index e3fec35..5a548e9 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -137,12 +137,6 @@ <Compile Include="OS\Win95\Win95Apps\WebChat1998.Designer.cs"> <DependentUpon>WebChat1998.cs</DependentUpon> </Compile> - <Compile Include="OS\Win95\Win95Apps\Win95Notepad.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="OS\Win95\Win95Apps\Win95Notepad.Designer.cs"> - <DependentUpon>Win95Notepad.cs</DependentUpon> - </Compile> <Compile Include="OS\Win95\Win95Apps\WinClassicAddressBook.cs"> <SubType>UserControl</SubType> </Compile> @@ -173,6 +167,12 @@ <Compile Include="OS\Win95\Win95Apps\WinClassicInstaller.Designer.cs"> <DependentUpon>WinClassicInstaller.cs</DependentUpon> </Compile> + <Compile Include="OS\Win95\Win95Apps\WinClassicNotepad.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="OS\Win95\Win95Apps\WinClassicNotepad.Designer.cs"> + <DependentUpon>WinClassicNotepad.cs</DependentUpon> + </Compile> <Compile Include="OS\Win95\Win95Apps\WinClassicWordPad.cs"> <SubType>UserControl</SubType> </Compile> @@ -207,9 +207,6 @@ <EmbeddedResource Include="OS\Win95\Win95Apps\WebChat1998.resx"> <DependentUpon>WebChat1998.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="OS\Win95\Win95Apps\Win95Notepad.resx"> - <DependentUpon>Win95Notepad.cs</DependentUpon> - </EmbeddedResource> <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicAddressBook.resx"> <DependentUpon>WinClassicAddressBook.cs</DependentUpon> </EmbeddedResource> @@ -225,6 +222,9 @@ <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicInstaller.resx"> <DependentUpon>WinClassicInstaller.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicNotepad.resx"> + <DependentUpon>WinClassicNotepad.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicWordPad.resx"> <DependentUpon>WinClassicWordPad.cs</DependentUpon> </EmbeddedResource> |