From db4bff0efce805cda1f5f7ebdfe04cff829996c4 Mon Sep 17 00:00:00 2001 From: "jrg@chromium.org" Date: Wed, 28 Jan 2009 02:15:38 +0000 Subject: Another merge conflict git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8786 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/unit/unit_tests.scons | 1 - 1 file changed, 1 deletion(-) (limited to 'chrome/test') diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index 8868526..adf72e7 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -287,7 +287,6 @@ input_files = ChromeFileList([ ]), MSVSFilter('test_infrastructure', [ 'chrome_test_suite.h', - '$CHROME_DIR/common/chrome_plugin_lib.cc', '$CHROME_DIR/common/ipc_test_sink.cc', '$CHROME_DIR/common/ipc_test_sink.h', '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', -- cgit v1.1