Merge branch 'master' of https://github.com/srgiri/MyGitProject.git

Conflicts: My Git Project/src/com/sam/MAIN.java
srgiri · Mar 19, 2018 · c7d1c41 · c7d1c41
2 parents fdb2e47 + d60b507
commit c7d1c41
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/My Git Project/src/com/sam/MAIN.java b/My Git Project/src/com/sam/MAIN.java
@@ -8,6 +8,7 @@ public static void main(String[] args) {
 		System.out.println("Second Modification");
 		System.out.println("Modification under testOne branch");
 		System.out.println("Unknow of the modification in the github browser.");
+		System.out.println("Edited in the github browser.");
 	}
 
 }