fix: removed conflict text, added doc for opt

codex-team · Jun 29, 2024 · 6b2b281 · 6b2b281
1 parent 4582d2a
commit 6b2b281
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/presentation/http/router/upload.ts b/src/presentation/http/router/upload.ts
@@ -23,6 +23,9 @@ interface UploadRouterOptions {
    */
   noteService: NoteService;
 
+  /**
+   * Note settings service instance
+   */
   noteSettingsService: NoteSettingsService;
 
   /**
@@ -100,15 +103,11 @@ const UploadRouter: FastifyPluginCallback<UploadRouterOptions> = async (fastify,
       },
     },
     attachValidation: true,
-<<<<<<< HEAD
     preHandler:[
       noteResolver,
       noteSettingsResolver,
       memberRoleResolver,
     ],
-=======
-    preHandler: [noteResolver],
->>>>>>> 9615a41936a09f160c2b27571457d4c3dd7f2afa
   }, async (request, reply) => {
     /**
      * @todo solve trouble with crashing app, when validations is not passed