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.

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

Fixes Issue from Pull Request #175. #192

Merged
merged 3 commits into from
Mar 3, 2014

Conversation

joshuapinter
Copy link
Contributor

Fixes Issue from Pull Request #175.

Alexandr Kozlov and others added 3 commits March 2, 2014 15:55
This fixes Issue pardom-zz#83

example:
@table(name = "Items", id = BaseColumns._ID)
public class Item extends Model {...}

Conflicts:
	src/com/activeandroid/Model.java
	src/com/activeandroid/TableInfo.java
Unique Groups and Index Groups caused a conflict with allowing for a custom Id column name.

This was discovered in Pull Request pardom-zz#175.
SeanPONeil added a commit that referenced this pull request Mar 3, 2014
Fixes Issue from Pull Request #175.
@SeanPONeil SeanPONeil merged commit 9adc7de into pardom-zz:master Mar 3, 2014
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.

2 participants