Änderungen

Summary

1. fix filechooser, remove conflicts before updating. (commit: c2be526) (details)

Commit c2be526a7451fda0fe84b2ba80b2660279338426 by frotty fix filechooser, remove conflicts before updating. (commit: c2be526)
	WurstSetup/src/main/java/file/DependencyManager.java (diff)
	WurstSetup/src/main/java/ui/MainWindow.java (diff)