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_e303_02.mdl
+++ b/nwnds_overland/ttd21_e303_02.mdl
@@ -954,11 +954,7 @@ node trimesh floor138.001
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 0.0 1500.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 41
    1.0 5.0 9.5
    -5.0 5.0 9.0