From 4e35353beaab2c5a5c6ccaf5d93eea3624428834 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 6 Nov 2025 21:54:03 -0500
Subject: [PATCH] fix rebase errors

---
 packages/backend/src/global/DependencyService.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/backend/src/global/DependencyService.ts b/packages/backend/src/global/DependencyService.ts
index 814dcf5a00..929fc319e2 100644
--- a/packages/backend/src/global/DependencyService.ts
+++ b/packages/backend/src/global/DependencyService.ts
@@ -8,10 +8,6 @@ import nodeFs from 'node:fs';
 import { Injectable } from '@nestjs/common';
 import { CacheManagementService, type ManagedMemoryKVCache } from '@/global/CacheManagementService.js';
 import { bindThis } from '@/decorators.js';
-<<<<<<<< HEAD:packages/backend/src/global/DependencyService.ts
-========
-import { type ManagedMemoryKVCache, CacheManagementService } from '@/global/CacheManagementService.js';
->>>>>>>> 3e14e73c59 (move global services to "global" directory):packages/backend/src/global/EnvService.ts
 
 @Injectable()
 export class DependencyService {