diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index f03326e40..cf7d1e2a4 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -15,8 +15,9 @@ public class UserService { public void notifyUser(int userId) { System.out.println("Main: sending notification to user " + userId); } - public void notifyUser2(int userId) { - System.out.println("dev: sending notification to user " + userId); + + public void notifyUser2(int userId) { + System.out.println("main: sending notification to user " + userId); } public void deleteUser(int userId) { @@ -26,4 +27,4 @@ public class UserService { private void logDeletion(int userId) { System.out.println("Main: user " + userId + " deleted"); } -} +} \ No newline at end of file diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index f35f48c0e..139155f7c 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,6 +5,6 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World! main"); - System.out.println("Hello, World! dev"); + System.out.println("Hello, World! dev"); } -} +} \ No newline at end of file