projects / osm / N2VC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8d7bce 6438e5b)
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)
Fixed name conflict in auto-generated code


Trivial merge