???

This is fixing a SyncThing issue between my laptop & workstation.
2021-08-16 10:56:57 -04:00
parent b502bde656
commit 6fa98a5a24
2456 changed files with 1800038 additions and 56 deletions
--- a/nwnds_overland/ttd21_b121_01.mdl
+++ b/nwnds_overland/ttd21_b121_01.mdl
@@ -372,11 +372,7 @@ node trimesh wok01
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 332.5 
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 46
    -5.0 -5.0 3.0
    -2.5 -5.0 3.0