mirror of
https://github.com/kolbytn/mindcraft.git
synced 2025-08-03 22:05:35 +02:00
resolve conflict
This commit is contained in:
parent
147203e36b
commit
343acd693a
1 changed files with 0 additions and 4 deletions
|
@ -513,11 +513,7 @@ export class Task {
|
|||
await new Promise((resolve) => setTimeout(resolve, 1000));
|
||||
waitCount++;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if (other_name === undefined && this.agent_count > 1) {
|
||||
=======
|
||||
if (other_name === undefined && this.data.agent_count > 1) {
|
||||
>>>>>>> main
|
||||
console.log('No other agents found. Task unsuccessful.');
|
||||
this.agent.killAll();
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue