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_w111_01.mdl
+++ b/nwnds_overland/ttd21_w111_01.mdl
@@ -152,11 +152,7 @@ node trimesh nmc_079e3df0
  diffuse 1.00 1.00 1.00
  specular 0.00 0.00 0.00
  selfillumcolor 0.00 0.00 0.00
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  shininess 31
  render 1
  shadow 0