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_02.mdl
+++ b/nwnds_overland/dsw20_i02_02.mdl
@@ -2699,11 +2699,7 @@ node trimesh Plane37_42
  Specular 0.0 0.0 0.0 
  shininess 10
  center 367.0 0.0 40.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 29
    -1.33 5.0 0.33
    -1.33 2.5 0.33