# Conflicts:
#	src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java
#	src/main/java/org/rcisoft/business/blesson/dao/BLessonRepository.java
#	src/main/java/org/rcisoft/business/blesson/entity/BLesson.java
#	src/main/java/org/rcisoft/business/blesson/service/BLessonService.java
#	src/main/java/org/rcisoft/business/blesson/service/impl/BLessonServiceImpl.java