???

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_w201_01.mdl
+++ b/nwnds_overland/ttd21_w201_01.mdl
@@ -932,11 +932,7 @@ node trimesh object12.001
  ambient 1 1 1
  diffuse 1 1 1
  specular 0 0 0
-<<<<<<< HEAD
-  bitmap ttd21_sand01
-=======
  bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
  shininess 1
  render 1
  shadow 0