Commit5ff605a

committed

Merge branch 'master' into fsharp4

Conflicts:src/fsharp/FSharp.Core.Unittests/FSharp.Core/PrimTypes.fs

2 parentscc6f41e +62fccd8 commit5ff605aCopy full SHA for 5ff605a

File tree

+160

-171

lines changed

+160

-171

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Applicationxmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
	`1`	`+<Applicationxmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
`2`	`2`	`xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"`
`3`	`3`	`x:Class="FSharp.Core.UnitTests.TestApp.App"`
`4`	`4`	`>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?xml version="1.0" encoding="utf-8" ?>`
	`1`	`+<?xml version="1.0" encoding="utf-8" ?>`
`2`	`2`	`<configuration>`
`3`	`3`	`<startup>`
`4`	`4`	`<supportedRuntimeversion="v4.0"sku=".NETFramework,Version=v4.5" />`

Comments

(0)