editor -> live editor

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