aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/TimeHACK.Main.csproj
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-07-13 12:09:22 -0500
committerlempamo <[email protected]>2017-07-13 12:09:22 -0500
commit80b07723bc8c5a320436a577f2d88ca71f6dc299 (patch)
tree1662f0f38e88c1ba53a64f594243f7e4e6a93028 /TimeHACK.Main/TimeHACK.Main.csproj
parenta48b40e45536ee5c58d4d6a23bde0a9fc2b8ae3d (diff)
parent22cca68c0de30099891c4cf275968e10b0494d9f (diff)
downloadhistacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.tar.gz
histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.tar.bz2
histacom2-80b07723bc8c5a320436a577f2d88ca71f6dc299.zip
fix conflict in vs :D
Diffstat (limited to 'TimeHACK.Main/TimeHACK.Main.csproj')
-rw-r--r--TimeHACK.Main/TimeHACK.Main.csproj1
1 files changed, 1 insertions, 0 deletions
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 052cbe8..a7a8817 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -482,6 +482,7 @@
<None Include="Resources\IE4\start_padamslink.png" />
<Content Include="Resources\modem_dial.wav" />
<None Include="Resources\MS-DOS-logo-1.png" />
+ <None Include="Resources\msdosprompt.png" />
<Content Include="Resources\std_beep.wav" />
<Content Include="Resources\std_gobeep.wav" />
<None Include="Resources\termCopy.png" />