# Conflicts: # lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
<<<<<<< HEAD
stand_lms
=======
nl_platform
9f65e6a27463ef0ec964119aae4c663aba274482
# Conflicts: # lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/ISchBasePointService.java
<<<<<<< HEAD
=======
9f65e6a27463ef0ec964119aae4c663aba274482