Skip to content
GitLab
Commit 149b9fe9 authored by opelhoward's avatar opelhoward
Browse files

fix conflict

parents 912d402d faab9d79
Hide whitespace changes
Inline Side-by-side
src/client/Elder Tale/src/elder/tale/Helper.java
View file @ 149b9fe9
......@@ -122,7 +122,7 @@ public class Helper {
DataInputStream in = new DataInputStream(client.getInputStream());
DataOutputStream output = new DataOutputStream(client.getOutputStream());
output.writeUTF(message);
output.write(message.getBytes());
String response = in.readUTF();
client.close();
return response;
......
src/server/.idea/workspace.xml
View file @ 149b9fe9
......@@ -36,11 +36,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="sconnectionhandler.py" pinned="false" current-in-tab="false">
<file leaf-file-name="sconnectionhandler.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sconnectionhandler.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.551724" vertical-offset="2652" max-vertical-offset="5797">
<caret line="174" column="0" selection-start-line="174" selection-start-column="0" selection-end-line="174" selection-end-column="0" />
<state vertical-scroll-proportion="0.04775281" vertical-offset="1870" max-vertical-offset="5797">
<caret line="111" column="46" selection-start-line="111" selection-start-column="46" selection-end-line="111" selection-end-column="46" />
<folding>
<element signature="e#21#32#0" expanded="true" />
</folding>
......@@ -68,10 +68,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="inventory.py" pinned="false" current-in-tab="true">
<file leaf-file-name="inventory.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/inventory.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.76884425" vertical-offset="0" max-vertical-offset="408">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="408">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
......@@ -84,8 +84,8 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/user.py" />
<option value="$PROJECT_DIR$/sconnectionhandler.py" />
<option value="$PROJECT_DIR$/tradebox.py" />
<option value="$PROJECT_DIR$/sconnectionhandler.py" />
</list>
</option>
</component>
......@@ -309,10 +309,10 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="false" />
<editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24304539" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24304539" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
......@@ -391,16 +391,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sconnectionhandler.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.551724" vertical-offset="2652" max-vertical-offset="5797">
<caret line="174" column="0" selection-start-line="174" selection-start-column="0" selection-end-line="174" selection-end-column="0" />
<folding>
<element signature="e#21#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tradebox.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="362" max-vertical-offset="969">
......@@ -419,11 +409,21 @@
</entry>
<entry file="file://$PROJECT_DIR$/inventory.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.76884425" vertical-offset="0" max-vertical-offset="408">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="408">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sconnectionhandler.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.04775281" vertical-offset="1870" max-vertical-offset="5797">
<caret line="111" column="46" selection-start-line="111" selection-start-column="46" selection-end-line="111" selection-end-column="46" />
<folding>
<element signature="e#21#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment