Update ember-cli-babel to v7.13.2

[Turbo87]

to unblock the ember-cli-htmlbars updates

[rust-highfive]

r? @carols10cents

(rust_highfive has picked a reviewer for you, use r? to override)

[bors]

☔ The latest upstream changes (presumably #1986) made this pull request unmergeable. Please resolve the merge conflicts.

[locks]

@bors r+

[bors]

📌 Commit 9c27318 has been approved by locks

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout babel-7 (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self babel-7 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging package.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #1970) made this pull request unmergeable. Please resolve the merge conflicts.

[Turbo87]

@bors r=@locks

[bors]

📌 Commit 992a39b has been approved by locks

[Turbo87]

@bors retry

🤔

[Turbo87]

@bors r=@locks

[bors]

💡 This pull request was already approved, no need to approve it again.

[bors]

📌 Commit 992a39b has been approved by locks

[Turbo87]

then why don't you merge it? 😅

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout babel-7 (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self babel-7 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging package.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #1988) made this pull request unmergeable. Please resolve the merge conflicts.

[Turbo87]

thank you npm...

@bors r=@locks

[bors]

📌 Commit 1e80d59 has been approved by locks

[bors]

⌛ Testing commit 1e80d59 with merge b4846ed...

[bors]

☀️ Test successful - checks-travis
Approved by: locks
Pushing b4846ed to master...