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

Fixed some doc block typos #105

Merged
merged 4 commits into from
Sep 10, 2013
Merged

Conversation

bcrowe
Copy link
Member

@bcrowe bcrowe commented Sep 10, 2013

Pointed to develop branch as requested in PR #104

Bryan Crowe and others added 3 commits September 7, 2013 18:34
@Phally
Copy link
Member

Phally commented Sep 10, 2013

Could you rebase your branch please? Seems like you are a bit behind and that causes a conflict. In that list of commits only your own should be there (just like #104).

@bcrowe
Copy link
Member Author

bcrowe commented Sep 10, 2013

Well, @jippi accepted my last PR into master, and master wasn't pulled back into develop since, so that's why there's these additional commits.

@Phally
Copy link
Member

Phally commented Sep 10, 2013

FFS @jippi, you fix this. 😆

Phally added a commit that referenced this pull request Sep 10, 2013
@Phally Phally merged commit 1bbe7a4 into FriendsOfCake:develop Sep 10, 2013
@ghost ghost assigned jippi Sep 10, 2013
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 293207b on bcrowe:fix-docblocks into 4bde670 on FriendsOfCake:develop.

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.

4 participants