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_s020_04.mdl
+++ b/nwnds_overland/ttd21_s020_04.mdl
@@ -3576,11 +3576,7 @@ node trimesh Plane02
  specular 0.0 0.0 0.0 
  shininess 1
  center 20.0 -163.0 0.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 4
    5.2 3.37 0.0
    -4.8 -6.63 0.0