From 13c6beccf8cd6098222904b21b8c3913e977c9ce Mon Sep 17 00:00:00 2001
From: Yannine Alvarez <yalvarez@roshka.com>
Date: Mon, 20 Apr 2020 21:50:50 -0400
Subject: [PATCH] Se agrega la rama poker_2 que contiene la función ganador.

---
 Poker/.idea/workspace.xml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Poker/.idea/workspace.xml b/Poker/.idea/workspace.xml
index b3bcc09..bd743c2 100644
--- a/Poker/.idea/workspace.xml
+++ b/Poker/.idea/workspace.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="628f93ca-b7ce-4a63-90a4-4fc67deaa2b5" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/Carta.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Poker/Carta.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/Poker/PokerKt.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Poker/PokerKt.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Poker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/Poker.kt" afterDir="false" />
-    </list>
+    <list default="true" id="628f93ca-b7ce-4a63-90a4-4fc67deaa2b5" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -108,7 +103,14 @@
       <option name="project" value="LOCAL" />
       <updated>1587334433015</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="corrección de valor de retorno, agregar return poker.">
+      <created>1587433599286</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1587433599286</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="VcsManagerConfiguration">
@@ -122,10 +124,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="413" y="109" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog/0.0.1366.728@0.0.1366.728" timestamp="1586915044775" />
-    <state x="313" y="0" key="CommitChangelistDialog2" timestamp="1587334430833">
+    <state x="313" y="0" key="CommitChangelistDialog2" timestamp="1587433753607">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="313" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1587334430833" />
+    <state x="313" y="0" key="CommitChangelistDialog2/0.0.1366.728@0.0.1366.728" timestamp="1587433753607" />
     <state width="1322" height="145" key="GridCell.Tab.0.bottom" timestamp="1587433392572">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
@@ -158,10 +160,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state width="1322" height="217" key="GridCell.Tab.1.right/0.0.1366.728@0.0.1366.728" timestamp="1587426755633" />
-    <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1587334538702">
+    <state x="275" y="95" key="Vcs.Push.Dialog.v2" timestamp="1587433621528">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1587334538702" />
+    <state x="275" y="95" key="Vcs.Push.Dialog.v2/0.0.1366.728@0.0.1366.728" timestamp="1587433621528" />
     <state x="92" y="92" width="1182" height="544" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1587430678418">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
--
libgit2 0.26.0