Closed pmolodo closed 5 years ago
In case you decide to accept both https://github.com/AnimalLogic/AL_USDMaya/pull/133 and https://github.com/AnimalLogic/AL_USDMaya/pull/142, this fixes a small merge conflict.
Thanks for consolidating these two PRs @elrond79; we will probably drop this though in favor of merging #133 and #142 separately.
Closing in favor of #142
Description (this won't be part of the changelog)
In case you decide to accept both https://github.com/AnimalLogic/AL_USDMaya/pull/133 and https://github.com/AnimalLogic/AL_USDMaya/pull/142, this fixes a small merge conflict.