raphael.savio
/
OOP_E4_Project
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solving conflicts

This commit is contained in:
l.dupuis-burtin 2024-04-10 16:56:00 +02:00
parent a60c16d748
commit 0113f48315
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/Simulator.java
View File

@ -268,9 +268,7 @@ public class Simulator extends Thread {
public void setLoopDelay(int delay) { public void setLoopDelay(int delay) {
//TODO : complete method //TODO : complete method
<<<<<<< HEAD
loopDelay=delay; loopDelay=delay;
=======
// this.loopDelay = delay; // this.loopDelay = delay;
// if (pauseFlag) { // if (pauseFlag) {
// return; // return;
@ -282,7 +280,6 @@ public class Simulator extends Thread {
// Thread.currentThread().interrupt(); // Restore interrupted status. // Thread.currentThread().interrupt(); // Restore interrupted status.
// System.err.println("Simulation step was interrupted."); // System.err.println("Simulation step was interrupted.");
// } // }
>>>>>>> branch 'master' of https://gitarero.ecam.fr/raphael.savio/OOP_E4_Project.git
} }
public void toggleClickAction() { public void toggleClickAction() {