Skip to content

Commit

Permalink
Merge branch 'master' into has-block-deprecation
Browse files Browse the repository at this point in the history
  • Loading branch information
ef4 committed Apr 4, 2021
2 parents 4636778 + a7260e5 commit 9c86e3a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "6"
- "10"

sudo: false
dist: trusty
Expand Down
4 changes: 2 additions & 2 deletions addon/templates/components/from-elsewhere.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
{{#if (has-block)}}
{{yield active.lastObject.component active.lastObject.outsideParams}}
{{else}}
{{#with active.lastObject.component as |c|}}
{{#let active.lastObject.component as |c|}}
{{component c}}
{{/with}}
{{/let}}
{{/if}}
{{/let}}
{{/if}}

0 comments on commit 9c86e3a

Please sign in to comment.