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_s200_02.mdl
+++ b/nwnds_overland/ttd21_s200_02.mdl
@@ -33,11 +33,7 @@ node trimesh groundbot109.001
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 346.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 101
    4.8 4.8 3.0
    4.8 -4.8 3.0