Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added the fixed for merge interface and scalar #157

Merged
merged 10 commits into from
Sep 12, 2018
Merged

added the fixed for merge interface and scalar #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ae4b03a
added the fixed for merge interface and scalar
iamrommel Aug 29, 2018
3bedb69
updated the package.json to include the cross-env to work with window…
iamrommel Aug 30, 2018
667ec5f
update hte package version
iamrommel Aug 30, 2018
6bcacac
added the fixed for merge interface and scalar
iamrommel Aug 30, 2018
611ad69
added the test for merging enum and scalar types that are declared twice
iamrommel Sep 10, 2018
d9d1705
added the interface for the items to be merged
iamrommel Sep 12, 2018
6cd6bf1
Update package.json
RodMachado Sep 12, 2018
5b14eb7
Update merge_types.test.js
RodMachado Sep 12, 2018
6377921
Update merge_types.test.js
RodMachado Sep 12, 2018
192d6e5
tests: fix enum tests to check for type and count
cfnelson Sep 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading