Update MHWs_PC_Beta.list

NRbene · Nov 1, 2024 · a76821d · a76821d
1 parent 96c0a52
commit a76821d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/Projects/MHWs_PC_Beta.list b/Projects/MHWs_PC_Beta.list
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 natives/stm/_develop/enummaker/dialoguecameraviewparamtype.user.3
 natives/stm/_develop/personal/environment/kanematsu/textures/null/nullhako_nrro.tex.240701001
 natives/stm/_develop/personal/model/ishikawa/hair_test/texture/scalp_nrro.tex.240701001
@@ -104256,7 +104255,4 @@ natives/stm/systems/shader/vfx/vortexel/spheretree/vortexelspheretree.sdf.240718
 natives/stm/systems/shader/vfx/vortexel/thermalconductor/vortexelthermalconductor.sdf.240718143
 natives/stm/systems/shader/vfx/vortexel/turbulence/vortexelturbulence.sdf.240718143
 natives/stm/systems/shader/vfx/vortexel/turbulence/vortexelturbulenceoutofrange.sdf.240718143
-natives/stm/systems/shader/volumetricrendering.sdf.240718143
-=======
-
->>>>>>> 007eca8d0e48e6f1942e905f4a59532a59a32b08
+natives/stm/systems/shader/volumetricrendering.sdf.240718143