Conflicts: src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java src/main/resources/egovframework/spring/com/context-idgen.xml |
||
|---|---|---|
| .. | ||
| adv/tngr/stngInfo/service | ||
| aplct | ||
| cmm | ||
| instr | ||
| oprtn | ||
Conflicts: src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctVO.java src/main/resources/egovframework/spring/com/context-idgen.xml |
||
|---|---|---|
| .. | ||
| adv/tngr/stngInfo/service | ||
| aplct | ||
| cmm | ||
| instr | ||
| oprtn | ||