Closed seansica closed 11 months ago
Attempted to merge origin/develop (up to commit e6b5319) to project-orion.
origin/develop
e6b5319
project-orion
https://github.com/center-for-threat-informed-defense/attack-workbench-rest-api/compare/project-orion...develop
Pulled 5 commits and 32 files changed.
A large subset of the changes are incompatible. They include the new Assets feature. This will need to be manually converted.
Attempted to merge
origin/develop
(up to commite6b5319
) toproject-orion
.https://github.com/center-for-threat-informed-defense/attack-workbench-rest-api/compare/project-orion...develop
Pulled 5 commits and 32 files changed.
A large subset of the changes are incompatible. They include the new Assets feature. This will need to be manually converted.