merge: fixed merge errors
This commit is contained in:
		
						commit
						1fcd84367d
					
				
					 2 changed files with 7 additions and 3 deletions
				
			
		|  | @ -1,6 +1,10 @@ | ||||||
| import express from 'express'; | import express from 'express'; | ||||||
| import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler, getSubmissionsHandler } from '../controllers/submissions.js'; | import { createSubmissionHandler, deleteSubmissionHandler, getSubmissionHandler, getSubmissionsHandler } from '../controllers/submissions.js'; | ||||||
| import { onlyAllowIfHasAccessToSubmission, onlyAllowIfHasAccessToSubmissionFromParams, onlyAllowSubmitter } from '../middleware/auth/checks/submission-checks.js'; | import { | ||||||
|  |     onlyAllowIfHasAccessToSubmission, | ||||||
|  |     onlyAllowIfHasAccessToSubmissionFromParams, | ||||||
|  |     onlyAllowSubmitter, | ||||||
|  | } from '../middleware/auth/checks/submission-checks.js'; | ||||||
| import { studentsOnly } from '../middleware/auth/checks/auth-checks.js'; | import { studentsOnly } from '../middleware/auth/checks/auth-checks.js'; | ||||||
| const router = express.Router({ mergeParams: true }); | const router = express.Router({ mergeParams: true }); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Reference in a new issue
	
	 Adriaan Jacquet
						Adriaan Jacquet