Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix samantha typo, but don't include "horray" correction, to keep fixes independent #186

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void testBeer()
public void testNames()
{
Lesson21 song = new Lesson21();
String[] names = {"Llewellyn", "Samatha", "Tomas", "Emilia"};
String[] names = {"Llewellyn", "Samantha", "Tomas", "Emilia"};
song.singSong(1, names);
song.singSong(2, names);
song.singSong(3, names);
Expand All @@ -45,7 +45,7 @@ public void testNumbers()
public void testNames3()
{
Lesson31 song = new Lesson31();
String[] names = {"Llewellyn", "Samatha", "Tomas", "Emilia"};
String[] names = {"Llewellyn", "Samantha", "Tomas", "Emilia"};
song.singSong(1, names);
song.singSong(2, names);
song.singSong(3, names);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Hip Hip Horray! For Llewellyn
Hello Samatha, it's nice to meet you.
Hello Samantha, it's nice to meet you.
Hello Tomas, it's nice to meet you.
Hello Emilia, it's nice to meet you.
Hello Llewellyn, it's nice to meet you.
Say yeah! Say yo! Say Samatha
Say yeah! Say yo! Say Samantha
Hello Tomas, it's nice to meet you.
Hello Emilia, it's nice to meet you.
Hello Llewellyn, it's nice to meet you.
Hello Samatha, it's nice to meet you.
Hello Samantha, it's nice to meet you.
Hello Tomas, it's nice to meet you.
Hello Emilia, it's nice to meet you.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Hip Hip Horray! For Llewellyn
Hello Samatha, it's nice to meet you.
Hello Samantha, it's nice to meet you.
Hello Tomas, it's nice to meet you.
Hello Emilia, it's nice to meet you.
Hello Llewellyn, it's nice to meet you.
SAMATHA! Yay Samatha!
SAMANTHA! Yay Samantha!
TOMAS! Yay Tomas!
EMILIA! Yay Emilia!
Hello Llewellyn, it's nice to meet you.
Hello Samatha, it's nice to meet you.
Hello Samantha, it's nice to meet you.
Hello Tomas, it's nice to meet you.
Hello Emilia, it's nice to meet you.