Commitfb309a9

committed

Fix merge issues

1 parent043c3e9 commitfb309a9Copy full SHA for fb309a9

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@`
`117`	`117`	`</Reference>`
`118`	`118`	`<ReferenceInclude="nunit.util.dll">`
`119`	`119`	`<Private>True</Private>`
	`120`	`+ </Reference>`
`120`	`121`	`<ReferenceInclude="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">`
`121`	`122`	`<SpecificVersion>true</SpecificVersion>`
`122`	`123`	`<HintPath>$(FSharpSourcesRoot)\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>`

Comments

(0)