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_b030_11.mdl
+++ b/nwnds_overland/ttd21_b030_11.mdl
@@ -60,11 +60,7 @@ node trimesh groundbot112
  specular 0 0 0
  shininess 1
  center -341 1 43.5
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 80
    1.4 4.8 -0.46
    -0.97 -4.79 0.04