Merge pull request swiftlang#132 from aschwaighofer/unxfail_4.1_objectmapper

aschwaighofer · web-flow · commit cc2560cce60f · 2018-02-07T08:57:44.000-08:00
[4.1] Un-XFAIL ObjectMapper on swift-4.1-branch
diff --git a/projects.json b/projects.json
@@ -1031,8 +1031,7 @@
           "compatibility": {
             "3.0": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-6690",
-                "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"
+                "master": "https://bugs.swift.org/browse/SR-6690"
               }
             }
 	  }
@@ -1048,8 +1047,7 @@
           "compatibility": {
             "3.0": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-6690",
-                "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"
+                "master": "https://bugs.swift.org/browse/SR-6690"
               }
             }
 	  }
@@ -1065,8 +1063,7 @@
           "compatibility": {
             "3.0": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-6690",
-                "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"
+                "master": "https://bugs.swift.org/browse/SR-6690"
               }
             }
 	  }
@@ -1082,8 +1079,7 @@
           "compatibility": {
             "3.0": {
               "branch": {
-                "master": "https://bugs.swift.org/browse/SR-6690",
-                "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"
+                "master": "https://bugs.swift.org/browse/SR-6690"
               }
             }
 	  }

Original file line number	Diff line number	Diff line change
`@@ -1031,8 +1031,7 @@`
`1031`	`1031`	`"compatibility": {`
`1032`	`1032`	`"3.0": {`
`1033`	`1033`	`"branch": {`
`1034`		`- "master": "https://bugs.swift.org/browse/SR-6690",`
`1035`		`- "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"`
	`1034`	`+ "master": "https://bugs.swift.org/browse/SR-6690"`
`1036`	`1035`	`}`
`1037`	`1036`	`}`
`1038`	`1037`	`}`
`@@ -1048,8 +1047,7 @@`
`1048`	`1047`	`"compatibility": {`
`1049`	`1048`	`"3.0": {`
`1050`	`1049`	`"branch": {`
`1051`		`- "master": "https://bugs.swift.org/browse/SR-6690",`
`1052`		`- "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"`
	`1050`	`+ "master": "https://bugs.swift.org/browse/SR-6690"`
`1053`	`1051`	`}`
`1054`	`1052`	`}`
`1055`	`1053`	`}`
`@@ -1065,8 +1063,7 @@`
`1065`	`1063`	`"compatibility": {`
`1066`	`1064`	`"3.0": {`
`1067`	`1065`	`"branch": {`
`1068`		`- "master": "https://bugs.swift.org/browse/SR-6690",`
`1069`		`- "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"`
	`1066`	`+ "master": "https://bugs.swift.org/browse/SR-6690"`
`1070`	`1067`	`}`
`1071`	`1068`	`}`
`1072`	`1069`	`}`
`@@ -1082,8 +1079,7 @@`
`1082`	`1079`	`"compatibility": {`
`1083`	`1080`	`"3.0": {`
`1084`	`1081`	`"branch": {`
`1085`		`- "master": "https://bugs.swift.org/browse/SR-6690",`
`1086`		`- "swift-4.1-branch": "https://bugs.swift.org/browse/SR-6690"`
	`1082`	`+ "master": "https://bugs.swift.org/browse/SR-6690"`
`1087`	`1083`	`}`
`1088`	`1084`	`}`
`1089`	`1085`	`}`