re, re, re-fixes the merge issues with this stupid csproj file, hopefully it now merges upwards properly.

Browse Source

...

This commit is contained in:

Shannon

2019-11-19 12:17:42 +11:00

parent 31f51516d2

commit ba35afa494

1 changed files with 306 additions and 501 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

807

src/Umbraco.Core/Umbraco.Core.csproj

File diff suppressed because it is too large Load Diff