???

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/bug01_n12_01.mdl
+++ b/nwnds_overland/bug01_n12_01.mdl
@@ -48,11 +48,7 @@ node aabb wok_194
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 31
-<<<<<<< HEAD
-    ttd21_sand01
-=======
    trd21_sand08
->>>>>>> nwnds_acidchalk
    Dirt
    Obscuring
    Grass