From 7cdd4d4ac09f181dcecc44aa4ea40d3bb0523df5 Mon Sep 17 00:00:00 2001
From: bajacqueli <bastien.jacquelin@etu.uca.fr>
Date: Mon, 13 Mar 2023 20:20:07 +0100
Subject: [PATCH] merge conflirs

---
 views/my-module.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/my-module.js b/views/my-module.js
index 3516f56..9c3610a 100644
--- a/views/my-module.js
+++ b/views/my-module.js
@@ -6,7 +6,7 @@ export default{
     },
     methods:{
         myMethod: function(){
-            yes+=" la mouche"
+            this.yes+=" la mouche"
             return yes
         }
     },