diff options
| author | C. Bess <cbess@cfaulks-air.pk5001z> | 2014-09-02 18:52:04 -0500 |
|---|---|---|
| committer | C. Bess <cbess@cfaulks-air.pk5001z> | 2014-09-02 18:52:04 -0500 |
| commit | 313c0daf05ccb5624ae5009565eb01c5ddeaa022 (patch) | |
| tree | 5f40a62e42e3a00fbe255328558dfcca7c3dd989 /scala.html.markdown | |
| parent | b50d4443cdca87e3342e2364c9e6afd2d7fce7d2 (diff) | |
| parent | 0b3f3e01e245ab2f73226fe4ba09d567ca76aa98 (diff) | |
- fix merge swift conflict
- Merge master
Diffstat (limited to 'scala.html.markdown')
| -rw-r--r-- | scala.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scala.html.markdown b/scala.html.markdown index 6b398b4b..379c092c 100644 --- a/scala.html.markdown +++ b/scala.html.markdown @@ -243,7 +243,7 @@ i // Show the value of i. Note that while is a loop in the classical sense - // A do while loop do { - println("x is still less then 10"); + println("x is still less than 10"); x += 1 } while (x < 10) |