Skip to content
This repository has been archived by the owner on Aug 20, 2018. It is now read-only.

This resolves the merge conflicts currently in pull request #6 #8

Merged
merged 2 commits into from Oct 9, 2012

Conversation

bobsilverberg
Copy link
Contributor

No description provided.

@stephendonner
Copy link
Contributor

Thanks, Bob; LGTM and let's get this in.

stephendonner added a commit that referenced this pull request Oct 9, 2012
This resolves the merge conflicts currently in pull request #6
@stephendonner stephendonner merged commit 4afafbe into mozilla:master Oct 9, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants