merge conflirs

game-view
Bastien JACQUELIN 2 years ago
parent 6b04c11beb
commit 7cdd4d4ac0

@ -6,7 +6,7 @@ export default{
}, },
methods:{ methods:{
myMethod: function(){ myMethod: function(){
yes+=" la mouche" this.yes+=" la mouche"
return yes return yes
} }
}, },

Loading…
Cancel
Save