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_e103_01.mdl
+++ b/nwnds_overland/twm21_e103_01.mdl
@@ -1055,11 +1055,7 @@ node trimesh ground_17
  diffuse 1 1 1
  specular 0 0 0
  shininess 1
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 67
    1.25 5 4.34
    5 -1.25 4.34
@@ -1300,11 +1296,7 @@ node trimesh ground_018
  diffuse 1 1 1
  specular 0 0 0
  shininess 1
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 46
    -1.81 -3.49 2.66
    -5.17 0.25 3.27