Skip to content

Commit d704210

Browse files
authored
Merge branch 'Together-Java:develop' into develop
2 parents a8996c9 + 9bb77da commit d704210

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/boolean/operator_precedence.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The operators that work on booleans have a "precedence order."
44

5-
This is defines an order of operations similar to mathematics, where multiplication and division happen before
5+
This defines an order of operations similar to mathematics, where multiplication and division happen before
66
addition and subtraction.
77

88
For booleans `!` always happens first. This is followed by `&&` and then by `||`.

src/floating_point_numbers/challenges.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ What will this program output when run? Write down your guess and then try runni
2525
void main() {
2626
double x = 5.1;
2727
double y = 2.1;
28-
System.out.println(x + y);
28+
System.out.println(x - y);
2929
}
3030
```
3131

src/records/return_multiple_values.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ void main() {
1616
Location treasureIsland = findTreasureIsland();
1717
System.out.println(
1818
"Treasure island is located at " +
19-
location.latitude() +
19+
treasureIsland.latitude() +
2020
" " +
21-
location.longitude() +
21+
treasureIsland.longitude() +
2222
"."
2323
);
2424
}
2525
```
2626

2727
Regular classes are, of course, still useful. Its just for classes which only
28-
hold some data together (and nothing else interesting) getting a constructor and accessors automatically is very convenient.
28+
hold some data together (and nothing else interesting) getting a constructor and accessors automatically is very convenient.

0 commit comments

Comments
 (0)