# Conflicts:
#	src/main/java/com/msl/FileUpdaterManager.java
#	src/main/java/com/msl/java/JavaNormalUpdater.java