accept incoming changes

AzureArchitecture / threat-model-templates

Templates for the Microsoft Threat Modeling Tool

MIT License

137 stars 40 forks source link

Closed chrisgriffis closed 5 years ago

chrisgriffis commented 5 years ago

fixed file that was committed with unresolved merge conflicts arbitrarily accepted all incoming changes as conflict resolution.