groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-07-12 04:11:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some missed merge fields

Browse source
This commit is contained in:
kontiko 2024-06-23 21:31:38 +00:00
parent 2d10669700
commit 6a3a37758c
2 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/Server.js
View file

@ -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

6
server/routers/ApiRouter.js
View file

@ -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
//