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_u01_04.mdl
+++ b/nwnds_overland/ttd21_u01_04.mdl
@@ -1032,11 +1032,7 @@ node trimesh v0101
  diffuse 1.0 1.0 1.0 
  specular 0.0 0.0 0.0 
  shininess 1.0
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 22
    -5.0 0.0 0.9
    -5.0 -2.5 0.9