[fix] solve git conflict

TeamPINGLE · Feb 15, 2024 · 52f1eb5 · 52f1eb5
1 parent a9bc0ff
commit 52f1eb5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/main/java/org/pingle/pingleserver/service/TeamService.java b/src/main/java/org/pingle/pingleserver/service/TeamService.java
@@ -85,6 +85,7 @@ public List<MyTeamResponse> getMyTeams(Long userId) {
             teams.add(myTeam);
         }
         return teams;
+    }
 
     public TeamNameDuplicatedResponse checkTeamName(String name) {
         return new TeamNameDuplicatedResponse(!teamRepository.existsByNameIgnoreCase(name));