diff options
| author | Ben Straub <bs@github.com> | 2013-11-11 20:42:26 +0400 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-11-11 20:54:39 +0400 |
| commit | 1679067e35348335130e6c7a206f497e1c378d73 (patch) | |
| tree | 7ddd35a21f05259c8373620664c37c81ddfc4474 /LibGit2Sharp.Tests/ConflictFixture.cs | |
| parent | 94aeb13043c31246348ecb399639c7779410d807 (diff) | |
Fix broken tests on OS X
Diffstat (limited to 'LibGit2Sharp.Tests/ConflictFixture.cs')
| -rw-r--r-- | LibGit2Sharp.Tests/ConflictFixture.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs index 5e6c3e7d..deec945c 100644 --- a/LibGit2Sharp.Tests/ConflictFixture.cs +++ b/LibGit2Sharp.Tests/ConflictFixture.cs @@ -13,7 +13,7 @@ namespace LibGit2Sharp.Tests { get { - return new[] + return new List<object[]> { new[] { "ancestor-and-ours.txt", "5dee68477001f447f50fa7ee7e6a818370b5c2fb", "dad0664ae617d36e464ec08ed969ff496432b075", null }, new[] { "ancestor-and-theirs.txt", "3aafd4d0bac33cc3c78c4c070f3966fb6e6f641a", null, "7b26cd5ac0ee68483ae4d5e1e00b064547ea8c9b" }, |