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

Fix merge issue with DisplayCapabilities #55

Merged
merged 3 commits into from
Jan 26, 2015
Merged

Fix merge issue with DisplayCapabilities #55

merged 3 commits into from
Jan 26, 2015

Conversation

mikeburke106
Copy link
Contributor

See issue #52 and previously fixed issue #1.

@mikeburke106 mikeburke106 added the REVIEW - scheduled The reviewer has scheduled a review of this PR for the current sprint label Jan 22, 2015
@justinjdickow justinjdickow added REVIEW - accepted The reviewer has approved the PR and removed REVIEW - scheduled The reviewer has scheduled a review of this PR for the current sprint labels Jan 23, 2015
mikeburke106 pushed a commit that referenced this pull request Jan 26, 2015
Merge pull request #55 from mikeburke106/origin/feature/display_capab…
5870f0d 
…ilities_hotfix

Fix merge issue with DisplayCapabilities
@mikeburke106 mikeburke106 merged commit 5870f0d into smartdevicelink:develop Jan 26, 2015
@mikeburke106 mikeburke106 deleted the origin/feature/display_capabilities_hotfix branch January 27, 2015 20:03
@mikeburke106 mikeburke106 mentioned this pull request Jan 28, 2015
Merged
@mikeburke106 mikeburke106 added this to the 3.2.0 milestone Jan 30, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
REVIEW - accepted The reviewer has approved the PR
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@mikeburke106 @justinjdickow