Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented May 30, 2019

Fixes #102

@phortx
Copy link
Collaborator

phortx commented May 31, 2019

Hi Viktor,

thanks for your contribution, looks very good :)

I left just a small change request.

Could you also pleas rebase on current master and rebuild the plugin to resolve the conflicts? Thank you very much :)

@ghost
Copy link
Author

ghost commented May 31, 2019

Now, wait for release this :)

@ghost
Copy link
Author

ghost commented Jun 6, 2019

@phortx Hey, can u merge? I wait this fix for dev my project :(

@phortx
Copy link
Collaborator

phortx commented Jun 7, 2019

Wow, I just totally forgot about this, sorry mate!

@phortx
Copy link
Collaborator

phortx commented Jun 7, 2019

There are two conflicting files. If you would resolve them, I will merge immediately :)

@ghost
Copy link
Author

ghost commented Jun 7, 2019

@phortx, fixed

@phortx phortx merged commit 0a4f142 into vuex-orm:master Jun 7, 2019
@phortx
Copy link
Collaborator

phortx commented Jun 7, 2019

Merged 😎

@phortx
Copy link
Collaborator

phortx commented Jun 7, 2019

@ghost
Copy link
Author

ghost commented Jun 7, 2019

@phortx Very good :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Do not uppercase root type name

2 participants