From d867586a71de05379d9b269741cddbfa8c1ac7d1 Mon Sep 17 00:00:00 2001
From: H4CK3R-01 <resiaknairolf@gmail.com>
Date: Tue, 8 Jun 2021 16:02:37 +0200
Subject: [PATCH] - fixed merge conflict

---
 public/js/game.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/public/js/game.js b/public/js/game.js
index ef93700..d80862e 100644
--- a/public/js/game.js
+++ b/public/js/game.js
@@ -95,6 +95,14 @@ function start_game() {
     });
     app.stage.addChild(cards_3);
 
+    socket.on('dice', function (data) {
+        console.log(data);
+    });
+
+    socket.on('card', function (data) {
+        console.log(data);
+    });
+
     resize();
 }