From 6a3a37758c853a05102092f71e42d1a0679140e0 Mon Sep 17 00:00:00 2001
From: kontiko <mail@kontiko.de>
Date: Sun, 23 Jun 2024 21:31:38 +0000
Subject: [PATCH] fixed some missed merge fields

---
 server/Server.js            | 3 ---
 server/routers/ApiRouter.js | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/server/Server.js b/server/Server.js
index dd5a32d39..5e69dc75e 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -35,11 +35,8 @@ const RssFeedManager = require('./managers/RssFeedManager')
 const CronManager = require('./managers/CronManager')
 const ApiCacheManager = require('./managers/ApiCacheManager')
 const BinaryManager = require('./managers/BinaryManager')
-<<<<<<< Updated upstream
 const ShareManager = require('./managers/ShareManager')
-=======
 const DLNAManager = require('./managers/DLNAManager')
->>>>>>> Stashed changes
 const LibraryScanner = require('./scanner/LibraryScanner')
 
 //Import the main Passport and Express-Session library
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 498b0ac3a..904f8a5f1 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -30,12 +30,9 @@ const ToolsController = require('../controllers/ToolsController')
 const RSSFeedController = require('../controllers/RSSFeedController')
 const CustomMetadataProviderController = require('../controllers/CustomMetadataProviderController')
 const MiscController = require('../controllers/MiscController')
-<<<<<<< Updated upstream
 const ShareController = require('../controllers/ShareController')
 
-=======
 const DLNAController = require('../controllers/DLNAController')
->>>>>>> Stashed changes
 const Author = require('../objects/entities/Author')
 const Series = require('../objects/entities/Series')
 
@@ -316,15 +313,12 @@ class ApiRouter {
     this.router.post('/custom-metadata-providers', CustomMetadataProviderController.middleware.bind(this), CustomMetadataProviderController.create.bind(this))
     this.router.delete('/custom-metadata-providers/:id', CustomMetadataProviderController.middleware.bind(this), CustomMetadataProviderController.delete.bind(this))
 
-<<<<<<< Updated upstream
     //
     // Share routes
     //
     this.router.post('/share/mediaitem', ShareController.createMediaItemShare.bind(this))
     this.router.delete('/share/mediaitem/:id', ShareController.deleteMediaItemShare.bind(this))
 
-=======
->>>>>>> Stashed changes
     //
     // Misc Routes
     //