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/twm21_e005_01.mdl
+++ b/nwnds_overland/twm21_e005_01.mdl
@@ -218,11 +218,7 @@ node trimesh ground_02.000
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 0.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 0
  faces 0
  tverts 4
@@ -1186,11 +1182,7 @@ node trimesh ground_01.004
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 162.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 80
    -5.0 1.25 0.0
    1.1 -5.0 0.5