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/feldcabla2.mdl
+++ b/nwnds_overland/feldcabla2.mdl
@@ -2244,11 +2244,7 @@ node trimesh plane01
  Specular 0.0 0.0 0.0 
  shininess 11
  center 265.0 265.0 0.0 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 8
    0.3 5.0 0.0
    0.3 4.5 0.0