Uploaded fixed overland hak

Uploaded fixed overland hak.
2021-07-30 21:53:04 -04:00
parent 818f5318d6
commit d6b5135161
657 changed files with 0 additions and 23676 deletions
--- a/nwnds_overland/ttd21_e000_06.mdl
+++ b/nwnds_overland/ttd21_e000_06.mdl
@@ -347,11 +347,7 @@ node trimesh plane538
  beaming 0
  render 1
  transparencyhint 0
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  rotatetexture 1
  orientation 0 0 0 0
  alpha 1