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_c001_01.mdl
+++ b/nwnds_overland/ttd21_c001_01.mdl
@@ -500,11 +500,7 @@ node trimesh colmesh33
  specular 0.0 0.0 0.0 
  shininess 1
  center -503.5 -194.5 -129.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 51
    -5.72 -5.0 -1.6
    -4.72 -5.0 -1.4