🤖 Applied provided resolved content to 2 merge conflicts

This commit is contained in:
Yasaswini-3004 2025-05-09 11:05:17 +00:00
commit 4bd8142776
2 changed files with 6 additions and 5 deletions

View file

@ -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);
System.out.println("main: sending notification to user " + userId);
}
public void deleteUser(int userId) {