???

2021-08-16 10:39:21 -04:00
parent a7f9fcdebe
commit b502bde656
2458 changed files with 62 additions and 1800044 deletions
--- a/nwnds_overland/ttd21_e303_03.mdl
+++ b/nwnds_overland/ttd21_e303_03.mdl
@@ -142,7 +142,11 @@ node trimesh floor138.002
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 0.0 2016.21 
+<<<<<<< HEAD
+  bitmap ttd21_sand01
+=======
  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 38
    5.0 4.2 20.8
    5.0 5.0 21.0