You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2023/10/09 06:24:43 UTC
[openmeetings] 11/27: no jira: unmerged file is fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit fe319eabedd95b0e54c92abf494eadf0f15de6fc
Author: Maxim Solodovnik <so...@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 8eeb5ab19..5f1d85126 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
@@ -986,12 +986,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 -> {