Skip to content

Commit

Permalink
Merge branch 'main' into CR-Config-API
Browse files Browse the repository at this point in the history
# Conflicts:
#	code/src/NCModel/Features.ts
#	code/src/NCModel/Managers.ts
  • Loading branch information
cristian-recoseanu committed Feb 10, 2025
2 parents 01b2cdf + 026a5e2 commit 3a301f4
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion code/src/NCModel/Features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ export class NcIdentBeacon extends NcWorker
];

properties[0].values = properties[0].values.concat(super.GetAllProperties(recurse)[0].values);

return properties;
}

Expand Down

0 comments on commit 3a301f4

Please sign in to comment.