From b60ee9944d67f8b0fb6b0af67b873cdb3570284a Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 23 Apr 2014 20:54:31 +1000 Subject: [PATCH] fix merge issues --- src/Umbraco.Tests/MockTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/MockTests.cs b/src/Umbraco.Tests/MockTests.cs index dfdf812606..9211321d55 100644 --- a/src/Umbraco.Tests/MockTests.cs +++ b/src/Umbraco.Tests/MockTests.cs @@ -96,7 +96,7 @@ namespace Umbraco.Tests new Mock().Object, new Mock().Object, new Mock().Object, - new Mock().Object), + new Mock().Object, new Mock().Object, new Mock().Object, new Mock().Object),