resolve conflict

This commit is contained in:
Isadora White 2025-05-05 13:31:04 -07:00
parent 147203e36b
commit 343acd693a

View file

@ -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();
}