[questions][chore] resolve conflicts

apps/portal/src/server/router/index.ts

@@ -3,22 +3,13 @@ import superjson from 'superjson';
 import { companiesRouter } from './companies-router';
 import { createRouter } from './context';
 import { protectedExampleRouter } from './protected-example-router';
-<<<<<<< HEAD
+import { questionsQuestionCommentRouter } from './questions-question-comment-router';
-import {questionsQuestionCommentRouter} from './questions-question-comment-router';
-import { resumesRouter } from './resumes';
-import { resumesDetailsRouter } from './resumes-details-router';
-import { resumesResumeProtectedTabsRouter } from './resumes-resume-protected-tabs-router';
-import { resumesResumeUserRouter } from './resumes-resume-user-router';
-import { resumeReviewsRouter } from './resumes-reviews-router';
-import { resumesReviewsUserRouter } from './resumes-reviews-user-router';
-=======
 import { questionsQuestionRouter } from './questions-question-router';
 import { resumesRouter } from './resumes/resumes-resume-router';
 import { resumesResumeUserRouter } from './resumes/resumes-resume-user-router';
 import { resumeReviewsRouter } from './resumes/resumes-reviews-router';
 import { resumesReviewsUserRouter } from './resumes/resumes-reviews-user-router';
 import { resumesStarUserRouter } from './resumes/resumes-star-user-router';
->>>>>>> main
 import { todosRouter } from './todos';
 import { todosUserRouter } from './todos-user-router';
 
@@ -36,11 +27,8 @@ export const appRouter = createRouter()
   .merge('resumes.star.user.', resumesStarUserRouter)
   .merge('resumes.reviews.', resumeReviewsRouter)
   .merge('resumes.reviews.user.', resumesReviewsUserRouter)
-<<<<<<< HEAD
+  .merge('questions.questions.comments.', questionsQuestionCommentRouter)
-  .merge('questions.questions.comments.', questionsQuestionCommentRouter);
-=======
   .merge('questions.questions.', questionsQuestionRouter);
->>>>>>> main
 
 // Export type definition of API
 export type AppRouter = typeof appRouter;

apps/portal/src/types/questions.d.ts

@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-export type QuestionComment = {
-  content: string;
-  createdAt: Date;
-  id: string;
-  numVotes: number;
-=======
 export type Question = {
   // TODO: company, location, role maps
   company: string;
@@ -16,6 +9,12 @@ export type Question = {
   numVotes: number;
   role: string;
   updatedAt: Date;
->>>>>>> main
   user: string;
+};
+
+export type QuestionComment = {
+  content: string;
+  createdAt: Date;
+  id: string;
+  numVotes: number;
 };