Skip to content
Snippets Groups Projects
Commit 494bb0d8 authored by Pedroza Aguirre Isaac's avatar Pedroza Aguirre Isaac
Browse files

Some merge bugs fixed

parent 6f42314c
No related branches found
No related tags found
No related merge requests found
Showing
with 16 additions and 46 deletions
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="" />
=======
<list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment=""> <list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
...@@ -32,7 +29,6 @@ ...@@ -32,7 +29,6 @@
<change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.form" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.java" afterDir="false" />
</list> </list>
>>>>>>> 4c8f776159855fde9cb2d4d4fddb9e800fee9122
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -43,12 +39,19 @@ ...@@ -43,12 +39,19 @@
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="delegatedBuild" value="true" /> <option name="delegatedBuild" value="true" />
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FindInProjectRecents">
<option name="RECENT_TEMPLATES"> <findStrings>
<list> <find>RMI</find>
<option value="Class" /> <find>Black</find>
</list> <find>colorOptions</find>
</option> <find>Send</find>
<find>message</find>
<find>userSelectComboBox</find>
<find>updateUserList</find>
<find>send</find>
<find>broadcastMessage</find>
<find>sent</find>
</findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -68,13 +71,10 @@ ...@@ -68,13 +71,10 @@
<component name="ProjectId" id="1SVgnDiSFxSanFbLYY5D9RJaXPS" /> <component name="ProjectId" id="1SVgnDiSFxSanFbLYY5D9RJaXPS" />
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="UI_DESIGNER_EDITOR_MODE.PaletteManager.SHOW" value="true" /> <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="387" />
<property name="UI_DESIGNER_EDITOR_MODE.PaletteManager.STATE" value="right" />
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.STATE" value="left" />
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="280" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../MaxCode/comp90015-dsass2-infinitymonkeys-remaster-mpriymak" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../Git Projects" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="Project" />
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Application.Client1"> <component name="RunManager" selected="Application.Client2">
<configuration name="Client 3" type="Application" factoryName="Application"> <configuration name="Client 3" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="client.Client" /> <option name="MAIN_CLASS_NAME" value="client.Client" />
<module name="infinitymonkeys" /> <module name="infinitymonkeys" />
...@@ -144,15 +144,8 @@ ...@@ -144,15 +144,8 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1571631720382</updated> <updated>1571631720382</updated>
<workItem from="1571631723795" duration="17601000" /> <workItem from="1571631723795" duration="17601000" />
<<<<<<< HEAD
<workItem from="1571654347656" duration="27259000" />
<workItem from="1571783604151" duration="19947000" />
<workItem from="1571812296671" duration="25759000" />
<workItem from="1571879738075" duration="12363000" />
=======
<workItem from="1571654347656" duration="25114000" /> <workItem from="1571654347656" duration="25114000" />
<workItem from="1571786278739" duration="3319000" /> <workItem from="1571786278739" duration="3319000" />
>>>>>>> 4c8f776159855fde9cb2d4d4fddb9e800fee9122
</task> </task>
<task id="LOCAL-00001" summary="Changed the join method to send over a reference of the ClientUpdate Interface"> <task id="LOCAL-00001" summary="Changed the join method to send over a reference of the ClientUpdate Interface">
<created>1571646862883</created> <created>1571646862883</created>
...@@ -194,28 +187,6 @@ ...@@ -194,28 +187,6 @@
<MESSAGE value="Changed the join method to send over a reference of the ClientUpdate Interface" /> <MESSAGE value="Changed the join method to send over a reference of the ClientUpdate Interface" />
<option name="LAST_COMMIT_MESSAGE" value="Changed the join method to send over a reference of the ClientUpdate Interface" /> <option name="LAST_COMMIT_MESSAGE" value="Changed the join method to send over a reference of the ClientUpdate Interface" />
</component> </component>
<<<<<<< HEAD
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/client/Client.java</url>
<line>47</line>
<option name="timeStamp" value="10" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/client/Client.java</url>
<line>57</line>
<option name="timeStamp" value="11" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/GUI/StartScreen.java</url>
<line>59</line>
<option name="timeStamp" value="13" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
=======
<component name="simpleUML.UMLToolWindowPlugin"> <component name="simpleUML.UMLToolWindowPlugin">
<General> <General>
<option name="birdViewUpdateDelay" value="2000" /> <option name="birdViewUpdateDelay" value="2000" />
...@@ -265,6 +236,5 @@ ...@@ -265,6 +236,5 @@
<option name="useAntialiasedConnectors" value="true" /> <option name="useAntialiasedConnectors" value="true" />
<option name="packageNameCompressionLevel" value="2" /> <option name="packageNameCompressionLevel" value="2" />
</Packagediagram> </Packagediagram>
>>>>>>> 4c8f776159855fde9cb2d4d4fddb9e800fee9122
</component> </component>
</project> </project>
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
File deleted
No preview for this file type
No preview for this file type
File deleted
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
File deleted
File deleted
No preview for this file type
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment