Skip to content

Commit 3794175

Browse files
Peppie84Pezmc
authored andcommitted
Resolve conflict from 8a20177
1 parent 8615a71 commit 3794175

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

src/RemoteTech2/RemoteTech2.csproj

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\ExtensionPack\$(MSBuildToolsVersion)\MSBuild.ExtensionPack.tasks" />
@@ -36,11 +36,11 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="Assembly-CSharp">
39-
<HintPath>C:\Users\Sander\Desktop\KSP Dev\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
39+
<HintPath>Assembly-CSharp.dll</HintPath>
4040
<Private>False</Private>
4141
</Reference>
4242
<Reference Include="Assembly-CSharp-firstpass">
43-
<HintPath>C:\Users\Sander\Desktop\KSP Dev\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
43+
<HintPath>Assembly-CSharp-firstpass.dll</HintPath>
4444
<Private>False</Private>
4545
</Reference>
4646
<Reference Include="System" />
@@ -50,7 +50,7 @@
5050
<Reference Include="System.Data" />
5151
<Reference Include="System.Xml" />
5252
<Reference Include="UnityEngine">
53-
<HintPath>C:\Users\Sander\Desktop\KSP Dev\KSP_Data\Managed\UnityEngine.dll</HintPath>
53+
<HintPath>UnityEngine.dll</HintPath>
5454
<Private>False</Private>
5555
</Reference>
5656
</ItemGroup>
@@ -126,11 +126,4 @@
126126
</Target>
127127
<Target Name="AfterBuild">
128128
</Target>
129-
<PropertyGroup>
130-
<PostBuildEvent>set GAMEPATH="D:\KerbalDev"
131-
set DestPath="%25GAMEPATH%25\GameData\RemoteTech2\Plugins"
132-
set Binary="%25GAMEPATH%25\KSP.exe"
133-
copy "$(TargetPath)" "%25DestPath%25"
134-
</PostBuildEvent>
135-
</PropertyGroup>
136129
</Project>

0 commit comments

Comments
 (0)