Remove merge conflict

This commit is contained in:
Pieter Vander Vennet 2020-07-22 15:56:43 +02:00
parent 6c7e09b8c8
commit e4f9eca9dd
2 changed files with 1 additions and 8 deletions

View file

@ -21,7 +21,7 @@ export default class Combine extends UIElement {
return elements;
}
protected InnerUpdate(htmlElement: HTMLElement) {
InnerUpdate(htmlElement: HTMLElement) {
for (const element of this.uiElements) {
if (element instanceof UIElement) {
element.Update();