fix: resterende merge errors gefixt
This commit is contained in:
		
							parent
							
								
									5a593cb88f
								
							
						
					
					
						commit
						01a0e7125a
					
				
					 2 changed files with 2 additions and 1089 deletions
				
			
		|  | @ -31,7 +31,7 @@ export function mapToQuestionDTO(question: Question): QuestionDTO { | |||
|         learningObjectIdentifier, | ||||
|         sequenceNumber: question.sequenceNumber!, | ||||
|         author: mapToStudentDTO(question.author), | ||||
|         inGroup: mapToGroupDTOId(question.inGroup), | ||||
|         inGroup: mapToGroupDTOId(question.inGroup, question.inGroup.assignment?.within), | ||||
|         timestamp: question.timestamp.toISOString(), | ||||
|         content: question.content, | ||||
|     }; | ||||
|  |  | |||
							
								
								
									
										1089
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										1089
									
								
								package-lock.json
									
										
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
		Reference in a new issue
	
	 Adriaan Jacquet
						Adriaan Jacquet