From d4b05c11c07e771bace8c83327e92216748116ca Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期日, 24 四月 2022 16:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
index a2619fa..d4995a0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/media/MediaController.java
@@ -65,7 +65,4 @@
}
return result;
}
-
-
-
}
--
Gitblit v1.8.0