This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch java11-modules in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/java11-modules by this push: new 470272eb6 no jira: unmerged file is fixed 470272eb6 is described below commit 470272eb6f3311dbee6a66af7aac918d0c959dc1 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Thu Dec 29 13:52:15 2022 +0700 no jira: unmerged file is fixed --- .../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java index f88a05883..0a927a994 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java @@ -981,12 +981,8 @@ public class BackupImport { /* * ##################### Import Recordings */ -<<<<<<< HEAD - void importRecordings(File base) { -======= // public for testing - public void importRecordings(File base) throws Exception { ->>>>>>> 2590e5123 (The build is green) + public void importRecordings(File base) { log.info("Meeting members import complete, starting recordings server import"); final Map<Long, Long> folders = new HashMap<>(); saveTree(base, "flvRecordings.xml", RECORDING_LIST_NODE, RECORDING_NODE, Recording.class, folders, r -> {