Removed merge issue

asbjornu · asbjornu · commit ab883a1171c6 · 2016-04-13T14:54:40.000+02:00
diff --git a/src/GitVersionCore.Tests/Mocks/MockRepository.cs b/src/GitVersionCore.Tests/Mocks/MockRepository.cs
@@ -97,14 +97,6 @@ public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)
         throw new NotImplementedException();
     }
 
-    public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)
-    {
-        throw new NotImplementedException();
-    }
-
-
-    public Dictionary<string, GitObject> LookupResults { get; set; }
-
     public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false)
     {
         throw new NotImplementedException();

Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,6 @@ public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)`
`97`	`97`	`throw new NotImplementedException();`
`98`	`98`	`}`
`99`	`99`
`100`		`- public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)`
`101`		`- {`
`102`		`- throw new NotImplementedException();`
`103`		`- }`
`104`		`-`
`105`		`-`
`106`		`- public Dictionary<string, GitObject> LookupResults { get; set; }`
`107`		`-`
`108`	`100`	`public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false)`
`109`	`101`	`{`
`110`	`102`	`throw new NotImplementedException();`