Skip to content

Commit

Permalink
fixed merging problem
Browse files Browse the repository at this point in the history
  • Loading branch information
csoltenborn committed Apr 27, 2019
1 parent b5ecc67 commit 97d5b71
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using GoogleTestAdapter.Common;
using GoogleTestAdapter.Helpers;
using GoogleTestAdapter.ProcessExecution;
using GoogleTestAdapter.TestAdapter.ProcessExecution;
Expand All @@ -22,7 +23,7 @@ public override void SetUp()
base.SetUp();

_mockDebuggerAttacher.Reset();
_mockDebuggerAttacher.Setup(a => a.AttachDebugger(It.IsAny<int>())).Returns(true);
_mockDebuggerAttacher.Setup(a => a.AttachDebugger(It.IsAny<int>(), It.IsAny<DebuggerEngine>())).Returns(true);
}

[TestMethod]
Expand Down

0 comments on commit 97d5b71

Please sign in to comment.