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_z002_01.mdl
+++ b/nwnds_overland/ttd21_z002_01.mdl
@@ -30,11 +30,7 @@ node trimesh ground_001
  specular 0 0 0
  shininess 1
  center 0 0 662.5
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 105
    -4.2 -2 6
    -3 5 8.25