From e945bc21e12768b1f31223db18c4abcbe64316f4 Mon Sep 17 00:00:00 2001
From: readhame <reda.adhame@etu.uca.fr>
Date: Thu, 16 Jul 2020 20:19:43 +0200
Subject: [PATCH] re commit

---
 HyperSet/.idea/workspace.xml | 5 +++--
 HyperSet/vues/js/set.js      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/HyperSet/.idea/workspace.xml b/HyperSet/.idea/workspace.xml
index fa87bb6..90356f9 100644
--- a/HyperSet/.idea/workspace.xml
+++ b/HyperSet/.idea/workspace.xml
@@ -125,6 +125,7 @@
       <workItem from="1594829060861" duration="586000" />
       <workItem from="1594896282228" duration="4161000" />
       <workItem from="1594923234569" duration="65000" />
+      <workItem from="1594923470651" duration="68000" />
     </task>
     <servers />
   </component>
@@ -168,10 +169,10 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1594813492846" />
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1594923230591">
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1594923468276">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594923230591" />
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594923468276" />
     <state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
diff --git a/HyperSet/vues/js/set.js b/HyperSet/vues/js/set.js
index e2ccaa3..bb27805 100644
--- a/HyperSet/vues/js/set.js
+++ b/HyperSet/vues/js/set.js
@@ -958,7 +958,7 @@ var Game = {
 
 					shapes1.splice(0,1,carte1.shape);
 					shapes1.splice(1,1,carte2.shape);
-					shapes1.splice(2,1,carte3.color);
+					shapes1.splice(2,1,carte3.shape);
 					shapes1.splice(3, 1, card4[0].shape);