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_e304_02.mdl
+++ b/nwnds_overland/ttd21_e304_02.mdl
@@ -759,11 +759,7 @@ node trimesh floor133
  Specular 0.0 0.0 0.0 
  shininess 10
  center -1.52588e-005 -0.268112 600.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 50
    5.0 -1.57 0.0
    5.0 3.41 0.0