From ecd3ec6751944667404d4e204cd9af43bf9ac702 Mon Sep 17 00:00:00 2001 From: hpkoh Date: Sun, 9 Oct 2022 21:22:45 +0800 Subject: [PATCH] [questions][chore] resolve conflict --- apps/portal/src/server/router/index.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/portal/src/server/router/index.ts b/apps/portal/src/server/router/index.ts index d89160fd..50bf70a0 100644 --- a/apps/portal/src/server/router/index.ts +++ b/apps/portal/src/server/router/index.ts @@ -3,6 +3,7 @@ import superjson from 'superjson'; import { companiesRouter } from './companies-router'; import { createRouter } from './context'; import { protectedExampleRouter } from './protected-example-router'; +import { questionsAnswerCommentRouter } from './questions-answer-comment-router'; import { questionsQuestionRouter } from './questions-question-router'; import { resumesRouter } from './resumes/resumes-resume-router'; import { resumesResumeUserRouter } from './resumes/resumes-resume-user-router'; @@ -26,11 +27,8 @@ export const appRouter = createRouter() .merge('resumes.star.user.', resumesStarUserRouter) .merge('resumes.reviews.', resumeReviewsRouter) .merge('resumes.reviews.user.', resumesReviewsUserRouter) -<<<<<<< HEAD - .merge('questions.answers.comments.', questionsAnswerCommentRouter); -======= + .merge('questions.answers.comments.', questionsAnswerCommentRouter) .merge('questions.questions.', questionsQuestionRouter); ->>>>>>> main // Export type definition of API export type AppRouter = typeof appRouter;