1 files changed, 0 insertions, 4 deletions
diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc
index 8707c4c..8d07251 100644
--- a/base/base_paths_posix.cc
+++ b/base/base_paths_posix.cc
@@ -104,15 +104,11 @@ bool PathProviderPosix(int key, FilePath* result) {
       return false;
     }
     case base::DIR_USER_CACHE:
-<<<<<<< HEAD
 #ifdef ANDROID
       NOTREACHED();
       return false;
 #else
-      scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
-=======
       scoped_ptr<base::Environment> env(base::Environment::Create());
->>>>>>> Chromium at release 7.0.540.0
       FilePath cache_dir(base::GetXDGDirectory(env.get(), "XDG_CACHE_HOME",
                                                ".cache"));
       *result = cache_dir;