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_t01_15.mdl
+++ b/nwnds_overland/ttd21_t01_15.mdl
@@ -293,11 +293,7 @@ node trimesh plane064
  Specular 0.0 0.0 0.0 
  shininess 1
  center -1500.0 1500.0 1.81308 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 289
    -5.0 -2.5 0.0
    -5.0 -5.0 0.0