From f95a13a0e6491e98452cfe57038a8089ad30c2dd Mon Sep 17 00:00:00 2001
From: bastien ollier <bastien.ollier@etu.uca.fr>
Date: Tue, 11 Jun 2024 10:52:38 +0200
Subject: [PATCH] editor -> live editor

---
 src/app/components/editor/editor.component.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/components/editor/editor.component.ts b/src/app/components/editor/editor.component.ts
index d9cd72e..89da786 100644
--- a/src/app/components/editor/editor.component.ts
+++ b/src/app/components/editor/editor.component.ts
@@ -166,14 +166,11 @@ export class EditorComponent {
     private router: Router,
     private backendService: BackendService
   ) {
-<<<<<<< HEAD
     backendService.getResult().subscribe((msg) => {
       if (msg.type === 'stdout' || msg.type === 'stderr') {
         this.resultContent += msg.text;
       }
     })
-=======
->>>>>>> 5f66c6e (lien editor -> live editor)
   }
 
   // Efface le contenu de l'éditeur