Recovering from erroneous merge

This commit is contained in:
ptsurbeleu 2012-08-01 09:20:11 -07:00
parent c1350cf404
commit 0d8f6c61e8
5 changed files with 47 additions and 15 deletions

View file

@ -1 +1 @@
%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger
%windir%\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe build.xml /target:Deploy /property:BuildConfiguration=Debug /v:n /fileLogger /m