From df49ea856a9d446c9f87742443eb763bac2e7045 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Tue, 27 Oct 2020 20:51:11 +0100
Subject: [PATCH] Fix conflict error

---
 front/src/WebRtc/MediaManager.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts
index 1cb1bdbb..672b09ae 100644
--- a/front/src/WebRtc/MediaManager.ts
+++ b/front/src/WebRtc/MediaManager.ts
@@ -167,7 +167,7 @@ export class MediaManager {
         gameOverlay.classList.remove('active');
     }
 
-    private enableCamera() {
+    public enableCamera() {
         this.enableCameraStyle();
         this.constraintsMedia.video = videoConstraint;
         this.getCamera().then((stream: MediaStream) => {
@@ -175,7 +175,7 @@ export class MediaManager {
         });
     }
 
-    private async disableCamera() {
+    public async disableCamera() {
         this.disableCameraStyle();
         this.stopCamera();
 
@@ -187,7 +187,7 @@ export class MediaManager {
         }
     }
 
-    private enableMicrophone() {
+    public enableMicrophone() {
         this.enableMicrophoneStyle();
         this.constraintsMedia.audio = true;
 
@@ -196,7 +196,7 @@ export class MediaManager {
         });
     }
 
-    private async disableMicrophone() {
+    public async disableMicrophone() {
         this.disableMicrophoneStyle();
         this.stopMicrophone();
 
@@ -574,7 +574,7 @@ export class MediaManager {
         return elem as T;
     }
 
-    private showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){
+    public showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){
         //create report text area
         const mainContainer = this.getElementByIdOrFail<HTMLDivElement>('main-container');