Skip to content

Fixed Merge Conflicts#1

Merged
brooklynDev merged 21 commits into
brooklynDev:masterfrom
tcyrus:master
Jul 24, 2015
Merged

Fixed Merge Conflicts#1
brooklynDev merged 21 commits into
brooklynDev:masterfrom
tcyrus:master

Conversation

@tcyrus
Copy link
Copy Markdown

@tcyrus tcyrus commented Jul 24, 2015

This pull request will fix merge conflicts in ryanflorence#1

Also adds tooltips

brooklynDev added a commit that referenced this pull request Jul 24, 2015
@brooklynDev brooklynDev merged commit a74b224 into brooklynDev:master Jul 24, 2015
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.

6 participants