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_i02_01.mdl
+++ b/nwnds_overland/dsw20_i02_01.mdl
@@ -3294,11 +3294,7 @@ node trimesh Plane37_18
  Specular 0.0 0.0 0.0 
  shininess 0
  center -0.5 0.0 40.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 15
    -1.34 5.0 0.33
    -1.34 2.5 0.33
@@ -3370,11 +3366,7 @@ node trimesh Plane37_17
  Specular 0.0 0.0 0.0 
  shininess 0
  center -0.5 0.0 40.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 15
    1.33 -5.0 0.33
    1.33 -2.5 0.33