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_b005_01.mdl
+++ b/nwnds_overland/ttd21_b005_01.mdl
@@ -3233,11 +3233,7 @@ node trimesh groundbot110
  specular 0 0 0
  shininess 1
  center 0 -341 43.5
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 104
    -4.8 -1.39 -0.46
    -4.8 0.97 0.04