From b16b7a9fa40955a0f6fde6e0057cbaa978ea244e Mon Sep 17 00:00:00 2001
From: srgooglo <srgooglo@ragestudio.net>
Date: Fri, 13 May 2022 14:58:53 +0200
Subject: [PATCH] added mediaroot

---
 packages/streaming-server/src/index.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/streaming-server/src/index.js b/packages/streaming-server/src/index.js
index f726ac20..027bdbb0 100644
--- a/packages/streaming-server/src/index.js
+++ b/packages/streaming-server/src/index.js
@@ -30,15 +30,8 @@ const MediaServerConfig = {
         ping: 30,
         ping_timeout: 60
     },
-<<<<<<< HEAD
     //logType: 0,
     mediaroot: path.resolve(process.cwd(), "./cache"),
-=======
-    http: {
-        port: 1000,
-        allow_origin: "*"
-    },
->>>>>>> c11505bacf345ac8b0e7799a04f90daa6922556a
     trans: {
         ffmpeg: ffmpeg.path,
         tasks: [