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/dsw20_i04_01.mdl
+++ b/nwnds_overland/dsw20_i04_01.mdl
@@ -4012,11 +4012,7 @@ node trimesh Plane37_33
  Specular 0.0 0.0 0.0 
  shininess 0
  center 366.0 -368.0 22.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 20
    -1.34 1.32 0.15
    -1.34 -1.18 0.15