???

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/dsc01_ph1_04.mdl
+++ b/nwnds_overland/dsc01_ph1_04.mdl
@@ -4468,11 +4468,7 @@ node trimesh ground01
  specular 0 0 0
  shininess 1
  center 0 0 0
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  verts 16
    -5 -5 0
    -2.5 -5 0