Skip to content

Commit

Permalink
Merge branch 'SayBye'
Browse files Browse the repository at this point in the history
# Conflicts:
#	MainProject/src/com/adfpractice/gittraining/HelloWorld.java
  • Loading branch information
Eugene Fedorenko committed Jul 20, 2016
2 parents 9f15a21 + 810ff74 commit 42ac49d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions MainProject/src/com/adfpractice/gittraining/HelloWorld.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ public HelloWorld()
}


public void sayBye()
{
System.out.println("Bye Bye!!!");
}


//Add some comment
Expand Down

0 comments on commit 42ac49d

Please sign in to comment.