From c323ab57593bd93973b8c0d280e4b5493286620a Mon Sep 17 00:00:00 2001 From: schrom01 Date: Sun, 1 May 2022 22:50:07 +0200 Subject: [PATCH] fixed Merging problem --- app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java index 5d49c4a..05bc85e 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FileIO.java @@ -172,6 +172,7 @@ public class FileIO { logger.warning("Failed to delete requested File"); throw new FileNotFoundException("File deletion unsuccessful"); } + } public class TournamentFile extends File{