Skip to content

/ ghostery-extension

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

Jump to bottom

Fix for broken Export (GH-1309) #155

Merged
merged 1 commit into from Aug 8, 2018
Merged

Fix for broken Export (GH-1309) #155

merged 1 commit into from Aug 8, 2018

Conversation

@zarembsky
Copy link
Contributor

@zarembsky zarembsky commented Aug 8, 2018

  • [ x] Have you followed the guidelines in CONTRIBUTING.md?
  • [ x] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • [ x] Have you added an explanation of what your changes do?
  • [ x] Does your submission pass tests?
  • [ x] Did you lint your code prior to submission?
@zarembsky
Fix for GH-1309.
Loading status checks…
65ae486
@zarembsky zarembsky requested review from IAmThePan, jsignanini, trickpattyFH20 and ghostery/ghostery as code owners Aug 8, 2018
@zarembsky zarembsky changed the base branch from master to develop Aug 8, 2018
@jsignanini
jsignanini requested changes Aug 8, 2018
View changes
Copy link
Member

@jsignanini jsignanini left a comment

@zarembsky The Account._buildUserSettings() seems to be overwritten by this pull request into an older version. Can you please fix this apparent merge issue? The function should be whatever is currently on the develop branch.
@jsignanini
jsignanini approved these changes Aug 8, 2018
View changes
@jsignanini jsignanini merged commit 45607f3 into develop Aug 8, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/push The Travis CI build passed
Details
@jsignanini jsignanini deleted the feature/exportFix branch Aug 8, 2018
jsignanini added a commit that referenced this pull request Aug 21, 2018
@zarembsky @jsignanini
Fix for GH-1309. (#155)
f8152b9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsignanini jsignanini

@IAmThePan IAmThePan

@trickpattyFH20 trickpattyFH20

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
@zarembsky @jsignanini