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

Merge remote-tracking branch 'GM_openInTab_closable_reopenable' - conflicts, merged fails #2264

Conversation

janekptacijarabaci
Copy link
Contributor

conflict

Ad 277cc71#diff-cc9068ae2f4d364d46afc036f489eb89R91

Ad #2141, #2257 (L88), #2262 (R92)

I did pull request - because of the certainty... (waiting for this patch go into stable version)

janekptacijarabaci referenced this pull request Sep 1, 2015
…e_reopenable'

# Conflicts:
#	content/browser.js
arantius added a commit that referenced this pull request Sep 1, 2015
…nTab_closable_reopenable

Merge remote-tracking branch 'GM_openInTab_closable_reopenable' - conflicts, merged fails
@arantius arantius merged commit c18795b into greasemonkey:master Sep 1, 2015
@janekptacijarabaci janekptacijarabaci deleted the _FIX_merged_GM_openInTab_closable_reopenable branch September 2, 2015 05:20
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.

None yet

2 participants