maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
Matt Bierner 2019-06-05 16:07:47 -07:00
parent d57db50463
commit f94d5ba08e
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/workbench/contrib/extensions/electron-browser/extensionsViews.ts
View file

@ -120,13 +120,7 @@ export class ExtensionsListView extends ViewletPanel {
renderBody(container: HTMLElement): void {
this.extensionsList = append(container, $('.extensions-list'));
this.messageContainer = append(container, $('.message-container'));
<<<<<<< HEAD
this.messageSeverityIcon = append(this.messageContainer, $(''));
=======
this.messageSeverityIcon = new SeverityIcon();
append(this.messageContainer, this.messageSeverityIcon.element);
this._register(this.messageSeverityIcon);
>>>>>>> Have Panel extend Disposable
this.messageBox = append(this.messageContainer, $('.message'));
const delegate = new Delegate();
const extensionsViewState = new ExtensionsViewState();