Merge branch 'bug'

Conflicts: test/src/com/test/Main.java Change-Id: I69e1688faa3d74ceb2b4aa60446c9d28daa6d2d8 Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
2012-03-02 12:18:28 -05:00
parent 11315f9ee6 673928763c
commit 9e6661733e
1 changed files with 1 additions and 0 deletions
--- a/test/src/com/test/Main.java
+++ b/test/src/com/test/Main.java
@@ -28,6 +28,7 @@ public class Main {
 		System.out.print("yay");
 		System.out.print("sleep");
 		System.out.print("poop");
+		System.out.print("Bug");
 	}

 	/**