Commit b7069ad
committed
Merge branch 'local' of https://github.com/tranHoang-Phuc/ielts-mate-be into prod
# Conflicts:
# .idea/workspace.xml1 file changed
Lines changed: 1 addition & 2 deletions
File tree
- listening-service/src/main/java/com/fptu/sep490/listeningservice/repository
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
| 25 | + | |
27 | 26 | | |
28 | 27 | | |
29 | 28 | | |
| |||
0 commit comments