aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved merge conflict

Browse Source
This commit is contained in:
hydrant
2018-11-21 17:28:23 +01:00
parent ce7daafda2
commit 09f0e5d900
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
reallife-gamemode.csproj
View File

@@ -12,7 +12,6 @@
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
</ItemGroup>
<<<<<<< HEAD
<ItemGroup Condition="'$(ConfigurationName)' != 'ServerBuild'">
<Reference Include="Bootstrapper">
<HintPath>..\..\bridge\runtime\Bootstrapper.dll</HintPath>
@@ -22,12 +21,6 @@
<Reference Include="Bootstrapper">
<HintPath>..\Bootstrapper.dll</HintPath>
</Reference>
=======
<ItemGroup>
<Reference Include="Bootstrapper">
<HintPath>..\..\bridge\runtime\Bootstrapper.dll</HintPath>
</Reference>
>>>>>>> feature/duty-system
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(ConfigurationName)' == 'Debug'">
<Exec Command="del &quot;..\..\client_packages\*&quot; /Q /S&#xD;&#xA;xcopy &quot;$(OutDir)*&quot; &quot;..\..\bridge\resources\reallife-gamemode&quot; /Y /Q&#xD;&#xA;del &quot;..\..\client_packages\*.*&quot; /Q&#xD;&#xA;xcopy &quot;..\..\reallife-gamemode\reallife-gamemode\Client\*&quot; &quot;..\..\client_packages\&quot; /S /Q /Y&#xD;&#xA;" />