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/dsc01_ch1_16.mdl
+++ b/nwnds_overland/dsc01_ch1_16.mdl
@@ -3251,11 +3251,7 @@ node trimesh ground01
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 300.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 16
    -5.0 5.0 3.0
    -2.5 5.0 3.0