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_c002_01.mdl
+++ b/nwnds_overland/ttd21_c002_01.mdl
@@ -1187,11 +1187,7 @@ node trimesh colmesh32
  specular 0.0 0.0 0.0 
  shininess 1
  center -201.0 0.0 -135.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 60
    -3.0 -5.0 -1.6
    -2.0 -5.0 -1.4