Fix merge

Author: kevin-lann

course-matrix/backend/src/routes/courseRouter.ts

@@ -1,4 +1,5 @@
 import express from "express";
+
 import coursesController from "../controllers/coursesController";
 import departmentsController from "../controllers/departmentsController";
 import offeringsController from "../controllers/offeringsController";

course-matrix/backend/src/routes/timetableRouter.ts

@@ -1,8 +1,9 @@
 import express from "express";
-import timetableController from "../controllers/timetablesController";
 import eventController from "../controllers/eventsController";
+import generatorController from "../controllers/generatorController";
 import restrictionsController from "../controllers/restrictionsController";
 import sharesController from "../controllers/sharesController";
+import timetableController from "../controllers/timetablesController";
 import { authHandler } from "../middleware/authHandler";
 
 export const timetableRouter = express.Router();
@@ -122,6 +123,12 @@ timetableRouter.delete(
   restrictionsController.deleteRestriction,
 );
 
+timetableRouter.post(
+  "/generate",
+  authHandler,
+  generatorController.generateTimetable,
+);
+
 /**
  * Route to create shared entry
  * @route POST /api/timetables/shared