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/ttdzg_f05_01.mdl
+++ b/nwnds_overland/ttdzg_f05_01.mdl
@@ -4388,11 +4388,7 @@ node trimesh a_ziggurat
  Specular 0.0 0.0 0.0 
  shininess 1
  center -56.833 -467.0 659.008 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 273
    -49.47 -27.53 3.0
    -40.56 -27.53 10.76