mirrors/mindcraft
1
0
Fork 0
mirror of https://github.com/kolbytn/mindcraft.git synced 2025-08-04 06:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
Isadora White 2025-05-05 13:31:04 -07:00
parent 147203e36b
commit 343acd693a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/agent/tasks/tasks.js
View file

@ -513,11 +513,7 @@ export class Task {
await new Promise((resolve) => setTimeout(resolve, 1000)); await new Promise((resolve) => setTimeout(resolve, 1000));
waitCount++; waitCount++;
} }
<<<<<<< HEAD
if (other_name === undefined && this.agent_count > 1) {
=======
if (other_name === undefined && this.data.agent_count > 1) { if (other_name === undefined && this.data.agent_count > 1) {
>>>>>>> main
console.log('No other agents found. Task unsuccessful.'); console.log('No other agents found. Task unsuccessful.');
this.agent.killAll(); this.agent.killAll();
} }