pull master + resolve conflicts

2 years ago · bf237efc15
parent 4a0aed7345 a35cb61b4d
commit bf237efc15
5 changed files with 2 additions and 1 deletions
--- a/images/logo-no-background.png
+++ b/images/logo-no-background.png
--- a/images/logo.png
+++ b/images/logo.png
--- a/resources/favicon.ico
+++ b/resources/favicon.ico
--- a/views/deck-module.js
+++ b/views/deck-module.js
@ -3,7 +3,7 @@ export default{
    props:{
        deckR:Deck,
        idRoom:String,
-        mode:String//true for chrono
+        mode:Boolean//true for chrono
    },
    data: function(){
        return{
--- a/views/game.html
+++ b/views/game.html
@ -10,6 +10,7 @@
    <link rel="stylesheet" type="text/css" href="/styles/index.css">
    <link rel="stylesheet" type="text/css" href="/styles/game.css">
    <link rel="stylesheet" type="text/css" href="/styles/card.css">
+    <link rel="icon" type="image/x-icon" href="/resources/favicon.ico">
 </head>