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_e102_02.mdl
+++ b/nwnds_overland/twm21_e102_02.mdl
@@ -814,11 +814,7 @@ node trimesh roc01.001
  specular 0 0 0
  shininess 1
  center 0 0 566.5
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 80
    -0.48 3.53 5.57
    0.47 -3.53 5.57
@@ -1533,11 +1529,7 @@ node trimesh roc01.003
  diffuse 1 1 1
  specular 0 0 0
  shininess 1
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 103
    1 5 3
    1.1 -5 3.5