Fix broken merge

python · JukkaL · Jul 7, 2017 · Jun 10, 2017 · Jun 10, 2017 · Jun 10, 2017
commit f90dabfdf977bf788348b50f0cea89093eb03ea7
diff --git a/test-data/unit/check-generics.test b/test-data/unit/check-generics.test
@@ -924,7 +924,7 @@ U = Union[int]
 x: O
 y: U
 
-reveal_type(x)  # E: Revealed type is 'builtins.int'
+reveal_type(x)  # E: Revealed type is 'Union[builtins.int, builtins.None]'
 reveal_type(y)  # E: Revealed type is 'builtins.int'
 
 U[int]  # E: Bad number of arguments for type alias, expected: 0, given: 1