show files in btdir

BattletechModders · Dec 10, 2024 · 7b41dcf · 7b41dcf
1 parent 4339657
commit 7b41dcf
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/ModTek/ModTek.csproj b/ModTek/ModTek.csproj
@@ -95,26 +95,11 @@
     <Asset Include="$(ProjectDir)\..\LICENSE" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
-  <!-- helpful direct access to resources in BT -->
-  <ItemGroup>
-    <None Include="$(BattleTechGameDir)\Mods\.modtek\*.txt;$(BattleTechGameDir)\Mods\.modtek\*.log"  LinkBase=".modtek" />
-    <None Include="$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.json;$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.csv" LinkBase="BattleTech_Data"/>
-  </ItemGroup>
-
-<<<<<<< HEAD
   <!-- helpful direct access to resources in BT, might trigger IDE indexing -->
-  <!--
-=======
-  <!-- helpful direct access to resources in BT -->
->>>>>>> 9bad06c (WIP 2)
   <ItemGroup>
     <None Include="$(BattleTechGameDir)\Mods\.modtek\*.txt;$(BattleTechGameDir)\Mods\.modtek\*.log"  LinkBase=".modtek" />
     <None Include="$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.json;$(BattleTechGameDir)\BattleTech_Data\StreamingAssets\data\**\*.csv" LinkBase="BattleTech_Data"/>
   </ItemGroup>
-<<<<<<< HEAD
-  -->
-=======
->>>>>>> 9bad06c (WIP 2)
 
   <ItemGroup>
     <ProjectReference Include="..\ModTek.Common\ModTek.Common.csproj" />