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_s102_01.mdl
+++ b/nwnds_overland/ttd21_s102_01.mdl
@@ -5377,11 +5377,7 @@ node trimesh ground_07
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 500.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 179
    -2.0 4.9 6.0
    5.0 4.7 8.0