fix merge conflict

51fcb1c1 · isidor · 5fccd2b9 · 51fcb1c1
隐藏空白更改
内联并排

Showing with 0 addition and 4 deletion

build/tfs/linux/smoketest.sh build/tfs/linux/smoketest.sh +0 -4

未找到文件。
--- a/build/tfs/linux/smoketest.sh
+++ b/build/tfs/linux/smoketest.sh
@@ -29,9 +29,5 @@ step "Run smoke test" \
 	pushd test/smoke
 	npm install
 	npm run compile
-<<<<<<< HEAD
-	xvfb-run -a -s="-screen 0 1024x768x8" node src/main.js --latest "$AGENT_BUILDDIRECTORY/VSCode-linux-ia32/code-insiders"
-=======
 	xvfb-run -a -s "-screen 0 1024x768x8" node src/main.js --latest "$AGENT_BUILDDIRECTORY/VSCode-linux-ia32/code-insiders"
->>>>>>> master
 	popd
\ No newline at end of file