Merge pull request #5 from juju/name-conflict
authorTim Van Steenburgh <tvansteenburgh@gmail.com>
Tue, 8 Nov 2016 16:55:39 +0000 (11:55 -0500)
committerGitHub <noreply@github.com>
Tue, 8 Nov 2016 16:55:39 +0000 (11:55 -0500)
commitced7d879a55c8e0e04b19fe504d7368b727afbed
tree37b63e140ad902121145d1d61e25af6a5da6c302
parentc8d7bcea7e1fd4b174e3be2a29e382df66e88b66
parent6438e5b4b66a45fc680c3d6dce15a044ad9979dd
Merge pull request #5 from juju/name-conflict

Fixed name conflict in auto-generated code