Resolve merge conflict around unused locals

This commit is contained in:
Matt Bierner
2017-11-07 11:29:48 -08:00
parent 68491dafa7
commit 04f322fc89
4 changed files with 2 additions and 18 deletions

View File

@@ -7,11 +7,9 @@ import * as assert from 'assert';
import { Selection } from 'vscode';
import { withRandomFileEditor, closeAllEditors } from './testUtils';
import { updateImageSize } from '../updateImageSize';
import * as path from 'path';
suite('Tests for Emmet actions on html tags', () => {
teardown(closeAllEditors);
const filePath = path.join(__dirname, '../../../../resources/linux/code.png');
test('update image css with multiple cursors in css file', () => {
const cssContents = `