Update src/libfetchers/cache.cc

NixOS · Nov 22, 2024 · 7cf3c9c · 7cf3c9c
1 parent 4d50e57
commit 7cf3c9c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/libfetchers/cache.cc b/src/libfetchers/cache.cc
@@ -36,11 +36,7 @@ struct CacheImpl : Cache
     {
         auto state(_state.lock());
 
-<<<<<<< HEAD
-        auto dbPath = getCacheDir() + "/nix/fetcher-cache-v2.sqlite";
-=======
         auto dbPath = getCacheDir() + "/fetcher-cache-v3.sqlite";
->>>>>>> e948c8e03 (Bump fetcher cache version)
         createDirs(dirOf(dbPath));
 
         state->db = SQLite(dbPath);