Skip to content

Commit bf15b70

Browse files
authored
test: fix merge conflict in show (#39399)
Fixes merge conflict breaking tests caused by fb59c19
1 parent 3ea80fb commit bf15b70

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/docs.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -965,10 +965,10 @@ abstract type $(curmod_prefix)Undocumented.at0{T<:Number, N}
965965
# Subtypes
966966
967967
```
968-
$(curmod_prefix)Undocumented.at1{T, N} where N where Integer<:T<:Number
968+
$(curmod_prefix)Undocumented.at1{T, N} where {Integer<:T<:Number, N}
969969
$(curmod_prefix)Undocumented.pt2
970970
$(curmod_prefix)Undocumented.st3
971-
$(curmod_prefix)Undocumented.st4{T, N} where N where T<:Number
971+
$(curmod_prefix)Undocumented.st4{T, N} where {T<:Number, N}
972972
```
973973
""")
974974
@test docstrings_equal(@doc(Undocumented.at0), doc"$doc_str")
@@ -1007,7 +1007,7 @@ abstract type $(curmod_prefix)Undocumented.at0{Int64, N}
10071007
# Subtypes
10081008
10091009
```
1010-
$(curmod_prefix)Undocumented.pt2{Int64, N, A} where A>:Integer where N
1010+
$(curmod_prefix)Undocumented.pt2{Int64, N, A} where {N, A>:Integer}
10111011
$(curmod_prefix)Undocumented.st3{Int64, N} where N
10121012
$(curmod_prefix)Undocumented.st4{Int64, N} where N
10131013
```
@@ -1157,9 +1157,9 @@ No documentation found.
11571157
11581158
# Union Composed of Types
11591159
1160-
- `$(curmod_prefix)Undocumented.at1{T, N} where N where T`
1161-
- `$(curmod_prefix)Undocumented.pt2{T, N, A} where A>:Integer where N where T`
1162-
- `$(curmod_prefix)Undocumented.st3{T, N} where N where T`
1160+
- `$(curmod_prefix)Undocumented.at1{T, N} where {T, N}`
1161+
- `$(curmod_prefix)Undocumented.pt2{T, N, A} where {T, N, A>:Integer}`
1162+
- `$(curmod_prefix)Undocumented.st3{T, N} where {T, N}`
11631163
- `$(curmod_prefix)Undocumented.st4`
11641164
""")
11651165
@test docstrings_equal(@doc(Undocumented.ut9), doc"$doc_str")

0 commit comments

Comments
 (0)