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.

Sign up for GitHub

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(compiler): throw when a component defines both template and templateUrl #15572

Merged
merged 1 commit into from
Mar 29, 2017
Merged

fix(compiler): throw when a component defines both template and templateUrl #15572

merged 1 commit into from
Mar 29, 2017
+14 −0

Conversation

DzmitryShylovich
Copy link
Contributor

Closes #15566

@vicb vicb added area: core Issues related to the framework runtime action: merge The PR is ready for merge by the caretaker pr_action: queued labels Mar 29, 2017
@vicb
Copy link
Contributor

vicb commented Mar 29, 2017

Thanks for the PR !

@vicb vicb merged commit 9c77a7c into angular:master Mar 29, 2017
@DzmitryShylovich DzmitryShylovich deleted the gh/15566 branch March 29, 2017 17:27
vicb pushed a commit that referenced this pull request Mar 29, 2017
@vicb
fix(compiler): throw when a component defines both template and templ…
902bb2f 
…ateUrl (#15572)

Closes #15566
asnowwolf pushed a commit to asnowwolf/angular that referenced this pull request Aug 11, 2017
@DzmitryShylovich
fix(compiler): throw when a component defines both template and templ…
4452105 
…ateUrl (angular#15572)

Closes angular#15566
juleskremer pushed a commit to juleskremer/angular that referenced this pull request Aug 28, 2017
@DzmitryShylovich @juleskremer
fix(compiler): throw when a component defines both template and templ…
52cb01f 
…ateUrl (angular#15572)

Closes angular#15566
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@vicb vicb vicb approved these changes

Assignees
No one assigned
Labels
action: merge The PR is ready for merge by the caretaker area: core Issues related to the framework runtime cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Silent failure if template + templateUrl are specified
3 participants
@DzmitryShylovich @vicb @googlebot