diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 09:25:21 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 09:25:21 +0000 |
| commit | 7409282b595d3d21e5813d6fe6e1a4cd3c439ce3 (patch) | |
| tree | 6a8a5eb51fe6867b39bc5a5838395c20b5bf914b /base/file_path_unittest.cc | |
| parent | 406810e402674f6ef1f8248c12a6b4f4a0223a8d (diff) | |
| download | chromium_src-7409282b595d3d21e5813d6fe6e1a4cd3c439ce3.zip chromium_src-7409282b595d3d21e5813d6fe6e1a4cd3c439ce3.tar.gz chromium_src-7409282b595d3d21e5813d6fe6e1a4cd3c439ce3.tar.bz2 | |
fix merge failure
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_path_unittest.cc')
| -rw-r--r-- | base/file_path_unittest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/file_path_unittest.cc b/base/file_path_unittest.cc index df5c48c..b4ad16f 100644 --- a/base/file_path_unittest.cc +++ b/base/file_path_unittest.cc @@ -6,7 +6,6 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" -#include "chrome/common/chrome_paths.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" |