diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 01:51:57 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 01:51:57 +0000 |
| commit | 514ac9fdc5d4ac273df5d2c6f7ac1f6fd879c28c (patch) | |
| tree | f5eb730406d415eb78a28b74c825cbc010f2285a | |
| parent | 760b0187465f93bf5a7c96a2966c91af6113b364 (diff) | |
| download | chromium_src-514ac9fdc5d4ac273df5d2c6f7ac1f6fd879c28c.zip chromium_src-514ac9fdc5d4ac273df5d2c6f7ac1f6fd879c28c.tar.gz chromium_src-514ac9fdc5d4ac273df5d2c6f7ac1f6fd879c28c.tar.bz2 | |
Merge conflict (crossed wires; this file was added somewhere else)
Review URL: http://codereview.chromium.org/19415
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8785 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index cc95e78..8868526 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -261,7 +261,6 @@ input_files = ChromeFileList([ '$CHROME_DIR/renderer/user_script_slave_unittest.cc', '$CHROME_DIR/renderer/render_process_unittest.cc', '$WEBKIT_DIR/glue/mock_webkit_glue.cc', - '$CHROME_DIR/renderer/net/render_dns_master.cc', '$CHROME_DIR/renderer/render_thread_unittest.cc', # test_infrastructure |