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

tests: Remove redundant xzdec.js include #676

Merged
merged 1 commit into from
Nov 28, 2020
Merged

tests: Remove redundant xzdec.js include #676

merged 1 commit into from
Nov 28, 2020

Conversation

Krinkle
Copy link
Collaborator

@Krinkle Krinkle commented Nov 22, 2020

Follows-up 0c53010, which removed this from www/index.html, but it was still present in the test suite.

This is now loaded automatically by RequireJS.


/cc @Jaifroid per https://github.com/kiwix/kiwix-js/pull/672/files/20229d190570f25a1bbed0353881579a394be221#r528327775


This supersedes the fork-PR at #675.

Follows-up 0c53010, which removed this from www/index.html,
but it was still present in the test suite.

This is now loaded automatically by RequireJS.
Copy link
Member

@Jaifroid Jaifroid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, tests passed. This can be merged.

@Jaifroid Jaifroid added this to the v3.1 milestone Nov 22, 2020
@Jaifroid
Copy link
Member

@Krinkle I think there is no obstacle to your merging this simple PR?

@kelson42 kelson42 merged commit cbc967e into master Nov 28, 2020
@kelson42 kelson42 deleted the xzdec-cleanup branch November 28, 2020 08:49
@Krinkle
Copy link
Collaborator Author

Krinkle commented Nov 28, 2020

@Krinkle I think there is no obstacle to your merging this simple PR?

Thanks, I wasn't sure what the workflow was meant to be. Most projects I've contributed to have the reviewer perform the merge act, so I figured maybe you or Kelson wanted to do that later.

To confirm, after seeing approval from one of you, I should feel free to merge my own PR?

@Jaifroid
Copy link
Member

@Krinkle I think for complex PRs we would probably want two devs to approve, but for something this straightforward one would be fine. But yes, once approved the author of the PR usually squashes and merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants