Skip to content

Fix merge from ecbacf to master#3090

Merged
beeender merged 3 commits intomasterfrom
merge-ecbacf-to-master
Jun 30, 2016
Merged

Fix merge from ecbacf to master#3090
beeender merged 3 commits intomasterfrom
merge-ecbacf-to-master

Conversation

@realm-ci
Copy link
Copy Markdown
Contributor

@realm-ci realm-ci commented Jun 30, 2016

No description provided.

zaki50 and others added 2 commits June 30, 2016 13:44
…oid name conflict. (#3083)

* use qualified name for model classes in generated code in order to avoid name conflict.

* add model classes that test issue 3077.

* update changelog for #3077
So DynamicRealm can have a warning logged as well.
@kneth kneth added the S:Review label Jun 30, 2016
@beeender beeender force-pushed the merge-ecbacf-to-master branch 2 times, most recently from 7bbfae9 to e040307 Compare June 30, 2016 08:29
@beeender beeender force-pushed the merge-ecbacf-to-master branch from e040307 to 4fbee1e Compare June 30, 2016 09:01
@zaki50
Copy link
Copy Markdown
Contributor

zaki50 commented Jun 30, 2016

👍

1 similar comment
@cmelchior
Copy link
Copy Markdown
Contributor

👍

@beeender beeender merged commit 0ee83b8 into master Jun 30, 2016
@beeender beeender deleted the merge-ecbacf-to-master branch June 30, 2016 09:21
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants