Fix merge issue part 2.

autodesk-forks · Apr 2, 2019 · eeae4f3 · eeae4f3
1 parent b167bc6
commit eeae4f3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/...lXRender/Handlers/StbImageLoader - Copy.h → ...aterialXRender/Handlers/StbImageLoader..h b/...lXRender/Handlers/StbImageLoader - Copy.h → ...aterialXRender/Handlers/StbImageLoader..h
diff --git a/...Render/Handlers/StbImageLoader - Copy.cpp → ...terialXRender/Handlers/StbImageLoader.cpp b/...Render/Handlers/StbImageLoader - Copy.cpp → ...terialXRender/Handlers/StbImageLoader.cpp