# Conflicts: # src/main/java/com/dbnt/faisp/controller/TranslatorController.java # src/main/java/com/dbnt/faisp/translator/TranslatorService.java |
||
|---|---|---|
| .. | ||
| adminPage | ||
| fragments | ||
| igActivities/fpiMgt | ||
| layout | ||
| login | ||
| translator | ||
| user | ||
# Conflicts: # src/main/java/com/dbnt/faisp/controller/TranslatorController.java # src/main/java/com/dbnt/faisp/translator/TranslatorService.java |
||
|---|---|---|
| .. | ||
| adminPage | ||
| fragments | ||
| igActivities/fpiMgt | ||
| layout | ||
| login | ||
| translator | ||
| user | ||