Fixing merge conflict

Browse Source

...

This commit is contained in:

elitsa

2020-01-09 16:43:02 +01:00

parent 0748fede86 b786dd185b

commit f8a1e4491b

5 changed files with 0 additions and 0 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

0

src/Umbraco.Tests.Shared/Builders/Markers/IWithAliasBuilder.cs → src/Umbraco.Tests.Shared/Builders/Interfaces/IWithAliasBuilder.cs

0

src/Umbraco.Tests.Shared/Builders/Markers/IWithCreateDateBuilder.cs → src/Umbraco.Tests.Shared/Builders/Interfaces/IWithCreateDateBuilder.cs

0

src/Umbraco.Tests.Shared/Builders/Markers/IWithIdBuilder.cs → src/Umbraco.Tests.Shared/Builders/Interfaces/IWithIdBuilder.cs

0

src/Umbraco.Tests.Shared/Builders/Markers/IWithNameBuilder.cs → src/Umbraco.Tests.Shared/Builders/Interfaces/IWithNameBuilder.cs

0

src/Umbraco.Tests.Shared/Builders/Markers/IWithUpdateDateBuilder.cs → src/Umbraco.Tests.Shared/Builders/Interfaces/IWithUpdateDateBuilder.cs