s/blacklist/blocklist/g #329

Merged
merged 2 commits into from Nov 3, 2016

Projects

None yet

3 participants

@beaufortfrancois
Member

Following #327 discussion, here's a patch that renames Blacklist to Blocklist.

@beaufortfrancois beaufortfrancois s/blacklist/blocklist/g
339c92d
@g-ortuno
Contributor
g-ortuno commented Nov 2, 2016

Seems there are some conflicts. Please rebase.

@beaufortfrancois beaufortfrancois Merge branch 'master' of github.com:WebBluetoothCG/web-bluetooth into…
… renameBlacklist
d18bf14
@beaufortfrancois
Member

Rebase is done.

@scheib scheib merged commit 1d5cfa4 into master Nov 3, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@scheib scheib deleted the renameBlacklist branch Nov 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment