Skip to content

Commit 1c137bf

Browse files
committed
Tut corrections
2 parents 6d5d446 + faaf68b commit 1c137bf

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

_pl/tour/for-comprehensions.md

+9
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ def someTuple(n: Int) =
4444
j <- 0 until n if i == j
4545
) yield (i, j)
4646
47+
<<<<<<< HEAD
4748
someTuple(10) foreach {
49+
=======
50+
someTuple(10, 10) foreach {
51+
>>>>>>> faaf68be8b9015aae742750a542a60378a373edc
4852
case (i, j) =>
4953
println(s"($i, $j) ") // drukuje (0, 0) (1, 1) (2, 2) (3, 3) (4, 4) (5, 5) (6, 6) (7, 7) (8, 8) (9, 9)
5054
}
@@ -82,8 +86,13 @@ Wszystkie powyższe przykłady posiadały wyrażenie `yield` na końcu _comprehe
8286

8387
```tut
8488
def count(n: Int) =
89+
<<<<<<< HEAD
8590
for (i <- 0 until n)
8691
println(s"$i ")
92+
=======
93+
for (i <- 0 until n)
94+
println(s"$i ")
95+
>>>>>>> faaf68be8b9015aae742750a542a60378a373edc
8796
8897
count(10) // wyświetli "0 1 2 3 4 5 6 7 8 9 "
8998
```

0 commit comments

Comments
 (0)