Uploaded fixed overland hak

Uploaded fixed overland hak.
2021-07-30 21:53:04 -04:00
parent 818f5318d6
commit d6b5135161
657 changed files with 0 additions and 23676 deletions
--- a/nwnds_overland/twm21_e002_01.mdl
+++ b/nwnds_overland/twm21_e002_01.mdl
@@ -418,11 +418,7 @@ beginmodelgeom twm21_e002_01
        diffuse 1 1 1
        specular 0 0 0
        shininess 1
-<<<<<<< HEAD
-        bitmap ttd21_sand01
-=======
        bitmap trd21_sand08
->>>>>>> nwnds_acidchalk
        verts 62
            -5 5 6.25
            5 -5 6.25