Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Issue #87. Moztrap #5933 #103

Merged
merged 4 commits into from Mar 7, 2013

Conversation

Projects
None yet
3 participants
Contributor

AlinT commented Feb 12, 2013

Please resolve the merge conflicts.

Contributor

sashakruglov commented Feb 12, 2013

Resolved merge conflict

Contributor

AndreiH commented Feb 15, 2013

sweet, looks good to me, except the merge conflicts, guess that you will resolve them after all reviews

Contributor

AlinT commented Mar 6, 2013

It seems there are merge conflicts again.
Can you update resolve them when you have time?thanks

Contributor

sashakruglov commented Mar 6, 2013

@AlinT done

Contributor

AlinT commented Mar 7, 2013

Sorry the long list of merge conflicts, this happens sometimes when pulls get merged.
Awesome pull and lgtm.

@AlinT AlinT added a commit that referenced this pull request Mar 7, 2013

@AlinT AlinT Merge pull request #103 from sashakruglov/moztrap_5933
Issue #87. Moztrap #5933
0962853

@AlinT AlinT merged commit 0962853 into mozilla:master Mar 7, 2013

@sashakruglov sashakruglov deleted the sashakruglov:moztrap_5933 branch Mar 9, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment