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/ttd21_e004_01.mdl
+++ b/nwnds_overland/ttd21_e004_01.mdl
@@ -220,11 +220,7 @@ node trimesh ground_01.003
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 150.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 103
    -3.0 4.6 0.0
    -2.0 4.6 0.0
@@ -618,11 +614,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 4
    5.0 5.0 0.0
    5.0 -5.0 0.0