merge fix

This commit is contained in:
Amish Shah
2017-02-22 20:39:21 +00:00
parent 8a2ec437e5
commit b55e6927e9
2 changed files with 1 additions and 15 deletions

Submodule typings updated: 997abfd2d5...3dbeb51fd2