Skip to content
Snippets Groups Projects
Commit f84d1aa1 authored by MANSOUR Chadi's avatar MANSOUR Chadi
Browse files

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gradle/8.10.2/executionHistory/executionHistory.bin
#	.gradle/8.10.2/executionHistory/executionHistory.lock
#	.gradle/8.10.2/fileHashes/fileHashes.bin
#	.gradle/8.10.2/fileHashes/fileHashes.lock
#	.gradle/8.10.2/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	build/classes/java/main/model/FirefighterBoard.class
#	build/classes/java/main/model/FirefighterManager.class
#	build/tmp/compileJava/previous-compilation-data.bin
#	src/main/java/model/FirefighterBoard.java
#	src/main/java/model/FirefighterManager.java
#	src/main/java/model/SimpleFirefighterMovementStrategy.java
parents 93c49d23 d7791947
No related branches found
No related tags found
No related merge requests found
Pipeline #41129 failed