.idea/workspace.xml in SimBot-0.1.33 vs .idea/workspace.xml in SimBot-0.1.34
- old
+ new
@@ -1,39 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
+<<<<<<< HEAD
<list default="true" id="d905eaf2-5cab-434b-a4d1-1ccf165356a4" name="Default" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/.rakeTasks" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/SimBot.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/SimBot.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.ruby-gemset" beforeDir="false" afterPath="$PROJECT_DIR$/.ruby-gemset" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.ruby-version" beforeDir="false" afterPath="$PROJECT_DIR$/.ruby-version" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/SimBot.gemspec" beforeDir="false" afterPath="$PROJECT_DIR$/SimBot.gemspec" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/SimBot.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SimBot.rb" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/lib/utils.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils.rb" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/SimBot-0.1.30.gem" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/lib/SimBot/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/SimBot/version.rb" afterDir="false" />
</list>
+=======
+ <list default="true" id="d905eaf2-5cab-434b-a4d1-1ccf165356a4" name="Default" comment="" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CoverageDataManager">
- <SUITE FILE_PATH="coverage/SimBot@Install_My_Gem.rcov" NAME="Install My Gem Coverage Results" MODIFIED="1540398933959" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="SimBot" />
+ <SUITE FILE_PATH="coverage/SimBot@Install_My_Gem.rcov" NAME="Install My Gem Coverage Results" MODIFIED="1528479809312" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="SimBot" />
<SUITE FILE_PATH="coverage/simbot@Install_My_Gem.rcov" NAME="Install My Gem Coverage Results" MODIFIED="1540290531990" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="SimBot" />
</component>
<component name="ExportToHTMLSettings">
<option name="printScope" value="1" />
<option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/exportToHTML" />
</component>
<component name="FUSProjectUsageTrigger">
<session id="-694921373">
<usages-collector id="statistics.lifecycle.project">
<counts>
- <entry key="project.closed" value="2" />
+ <entry key="project.closed" value="3" />
<entry key="project.open.time.10" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.9" value="1" />
<entry key="project.opened" value="3" />
</counts>
@@ -42,22 +40,26 @@
<counts>
<entry key="Gemfile" value="3" />
<entry key="SimBot" value="1" />
<entry key="console" value="1" />
<entry key="gemspec" value="1" />
+ <entry key="gitignore" value="1" />
<entry key="lock" value="1" />
+ <entry key="rakeTasks" value="1" />
<entry key="rb" value="13" />
<entry key="ruby-gemset" value="2" />
<entry key="ruby-version" value="2" />
<entry key="setup" value="1" />
+ <entry key="xml" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
- <entry key="PLAIN_TEXT" value="4" />
+ <entry key="PLAIN_TEXT" value="6" />
<entry key="RbenvGemsets" value="2" />
<entry key="Ruby" value="19" />
+ <entry key="XML" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="gemspec" value="2" />
@@ -72,93 +74,201 @@
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
+<<<<<<< HEAD
+ <splitter split-orientation="horizontal" split-proportion="0.5059264">
+ <split-first>
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="SimBot.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1173">
+ <caret line="63" column="15" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="19071.errfile" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/19071.errfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="391">
+ <caret line="17" selection-start-line="17" selection-end-line="17" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="SimBot_spec.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="161">
+ <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="322">
+ <caret line="14" selection-start-line="14" selection-end-line="14" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="utils.rb" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/lib/utils.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="290">
+ <caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </split-first>
+ <split-second>
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="barong.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="345">
+ <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="geth.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="506">
+ <caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ngrok.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="376">
+ <caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="peatio.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/ApiController/peatio.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="483">
+ <caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="wash_trade.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="667">
+ <caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="simple_mm.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="621">
+ <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="23">
+ <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </split-second>
+ </splitter>
+=======
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="SimBot.gemspec" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/SimBot.gemspec">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="690">
- <caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Gemfile">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="115">
- <caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name=".ruby-version" pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.ruby-version">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="10" selection-start-column="10" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/.ruby-gemset">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="46">
- <caret line="2" column="3" lean-forward="true" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
+ <state>
+ <caret column="13" selection-start-column="13" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="bitcoind.rb" pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
+ <state relative-caret-position="60">
<caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SimBot.rb" pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="322">
- <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
+ <state relative-caret-position="195">
+ <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="utils.rb" pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/utils.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
+ <state relative-caret-position="-1675">
+ <caret line="100" column="64" selection-start-line="100" selection-start-column="64" selection-end-line="100" selection-end-column="64" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="geth.rb" pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="644">
+ <state relative-caret-position="420">
<caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="bitcoind-abc.rb" pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="149">
- <caret line="25" selection-start-line="25" selection-end-line="25" />
+ <state relative-caret-position="285">
+ <caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
</state>
</provider>
</entry>
</file>
</leaf>
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Ruby Class Template" />
@@ -199,21 +309,28 @@
<option value="$PROJECT_DIR$/90429.outfile" />
<option value="$PROJECT_DIR$/98588.errfile" />
<option value="$PROJECT_DIR$/lib/ApiController/peatio.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/wash_trade.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/simple_mm.rb" />
+ <option value="$PROJECT_DIR$/lib/ApiController/barong.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/geth.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/ngrok.rb" />
+<<<<<<< HEAD
+ <option value="$PROJECT_DIR$/lib/SimBot.rb" />
+ <option value="$PROJECT_DIR$/lib/utils.rb" />
+ <option value="$PROJECT_DIR$/lib/SimBot/version.rb" />
+=======
+ <option value="$PROJECT_DIR$/lib/utils.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/litecoind.rb" />
<option value="$PROJECT_DIR$/lib/ApiController/barong.rb" />
<option value="$PROJECT_DIR$/lib/Deamons/bitcoind.rb" />
<option value="$PROJECT_DIR$/SimBot.gemspec" />
<option value="$PROJECT_DIR$/.ruby-version" />
<option value="$PROJECT_DIR$/lib/SimBot/version.rb" />
<option value="$PROJECT_DIR$/lib/SimBot.rb" />
- <option value="$PROJECT_DIR$/lib/utils.rb" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
@@ -223,52 +340,55 @@
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="1639" />
- <option name="y" value="23" />
- <option name="width" value="1484" />
- <option name="height" value="1057" />
+ <option name="x" value="1565" />
+ <option name="y" value="40" />
+ <option name="width" value="1440" />
+ <option name="height" value="877" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
</path>
+<<<<<<< HEAD
<path>
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
- <item name="Deamons" type="462c0819:PsiDirectoryNode" />
+ <item name="SimBot" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="SimBot" type="b2602c69:ProjectViewProjectNode" />
<item name="SimBot" type="462c0819:PsiDirectoryNode" />
- <item name="lib" type="462c0819:PsiDirectoryNode" />
- <item name="SimBot" type="462c0819:PsiDirectoryNode" />
+ <item name="spec" type="462c0819:PsiDirectoryNode" />
</path>
+=======
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</expand>
<select />
</subPane>
</pane>
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
+ <property name="SearchEverywhereHistoryKey" value="workspace.xml	FILE	file:///Users/nikhar/Git/OVEX-Bitbucket/simbot/.idea/workspace.xml" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<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="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
@@ -297,11 +417,11 @@
</option>
</component>
<component name="RunManager">
<configuration name="Install My Gem" type="CommandRunConfigurationType" factoryName="Gem Command">
<module name="SimBot" />
- <COMMAND_RUN_CONFIGURATION NAME="RUBY_ARGS" VALUE="" />
+ <COMMAND_RUN_CONFIGURATION NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
<COMMAND_RUN_CONFIGURATION NAME="WORK DIR" VALUE="$MODULE_DIR$" />
<COMMAND_RUN_CONFIGURATION NAME="SHOULD_USE_SDK" VALUE="false" />
<COMMAND_RUN_CONFIGURATION NAME="ALTERN_SDK_NAME" VALUE="" />
<COMMAND_RUN_CONFIGURATION NAME="myPassParentEnvs" VALUE="true" />
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
@@ -338,20 +458,28 @@
<workItem from="1532961242324" duration="27612000" />
<workItem from="1534345863853" duration="3800000" />
<workItem from="1535884475044" duration="1850000" />
<workItem from="1538040677596" duration="5889000" />
<workItem from="1539353817379" duration="2621000" />
+<<<<<<< HEAD
+ <workItem from="1539876285945" duration="1050000" />
+ <workItem from="1540108116200" duration="1082000" />
+=======
<workItem from="1539876285945" duration="739000" />
<workItem from="1539962617528" duration="7924000" />
<workItem from="1540289900445" duration="2400000" />
- <workItem from="1540392568366" duration="340000" />
- <workItem from="1540393269263" duration="744000" />
+ <workItem from="1540392568366" duration="1094000" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="181547000" />
+<<<<<<< HEAD
+ <option name="totallyTimeSpent" value="177145000" />
+=======
+ <option name="totallyTimeSpent" value="181557000" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
@@ -359,33 +487,62 @@
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="1639" y="23" width="1484" height="1057" extended-state="0" />
+ <frame x="1565" y="40" width="1440" height="877" extended-state="0" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18099861" />
+<<<<<<< HEAD
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.32995495" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
- <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.3962804" side_tool="true" weight="0.35325366" />
+ <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50904554" side_tool="true" weight="0.3457207" />
<window_info anchor="right" id="Database" order="3" />
- <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
- <window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6037196" visible="true" weight="0.35262594" />
+ <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.48658764" weight="0.35192564" />
+ <window_info anchor="bottom" id="Version Control" order="7" weight="0.3292683" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.7010014" weight="0.35691318" />
+ <window_info active="true" anchor="bottom" id="Terminal" order="7" sideWeight="0.49095446" visible="true" weight="0.34794158" />
+=======
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18454936" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49896193" weight="0.32876712" />
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6044349" weight="0.35342467" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+<<<<<<< HEAD
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18025751" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+=======
+ <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.70028615" visible="true" weight="0.44246575" />
+ <window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
+ <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.29971388" side_tool="true" visible="true" weight="0.44246575" />
+ <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49928468" weight="0.3283767" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
- <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49928468" weight="0.3283767" />
+ <window_info anchor="bottom" id="TODO" order="6" weight="0.32995495" />
+ <window_info anchor="bottom" id="Version Control" order="10" weight="0.3292683" />
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.48658764" weight="0.3528761" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="right" id="Database" order="3" />
+ <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49965397" weight="0.3293348" />
<window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50904554" side_tool="true" weight="0.3457207" />
+ <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" sideWeight="0.49896193" weight="0.32876712" />
+ <window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49095446" weight="0.22328767" />
+ <window_info id="Favorites" order="2" side_tool="true" />
</layout>
<layout-to-restore>
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -415,60 +572,81 @@
<option featureType="com.intellij.fileTypeFactory" implementationName="*.rb" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager>
+ <option name="time" value="8" />
+ </breakpoint-manager>
+ </component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/.ruby-version">
+ <entry file="file://$PROJECT_DIR$/5834.errfile" />
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="10" selection-start-column="10" selection-end-column="10" />
+ <state relative-caret-position="621">
+ <caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
+ <entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="13" selection-start-column="13" selection-end-column="13" />
+ <state relative-caret-position="345">
+ <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
+ <entry file="file://$PROJECT_DIR$/18301.outfile" />
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
- <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
+ <state relative-caret-position="552">
+ <caret line="24" column="31" selection-start-line="24" selection-start-column="31" selection-end-line="24" selection-end-column="31" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
+ <entry file="file://$PROJECT_DIR$/19071.errfile">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="322">
- <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
+ <state relative-caret-position="391">
+ <caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/utils.rb">
+ <entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2300">
- <caret line="100" column="64" selection-start-line="100" selection-start-column="64" selection-end-line="100" selection-end-column="64" />
+ <state relative-caret-position="161">
+ <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
+ <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="644">
- <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
+ <state relative-caret-position="23">
+ <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
+ <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="437">
- <caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
+ <state relative-caret-position="1173">
+ <caret line="51" column="15" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/utils.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="290">
+ <caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="376">
+ <caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/98808.errfile" />
<entry file="file://$PROJECT_DIR$/98808.outfile" />
<entry file="file://$PROJECT_DIR$/98990.outfile" />
<entry file="file://$PROJECT_DIR$/99082.errfile" />
<entry file="file://$PROJECT_DIR$/99150.errfile" />
@@ -498,81 +676,113 @@
<entry file="file://$PROJECT_DIR$/98975.errfile" />
<entry file="file://$PROJECT_DIR$/5834.errfile" />
<entry file="file://$PROJECT_DIR$/18301.outfile" />
<entry file="file://$PROJECT_DIR$/19071.errfile">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
+ <state relative-caret-position="391">
<caret line="17" selection-start-line="17" selection-end-line="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/spec/SimBot_spec.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
+ <state relative-caret-position="161">
<caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
</state>
</provider>
</entry>
+<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
+ <state relative-caret-position="322">
<caret line="14" selection-start-line="14" selection-end-line="14" />
</state>
</provider>
</entry>
+=======
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
<entry file="file://$PROJECT_DIR$/lib/ApiController/peatio.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
+ <state relative-caret-position="483">
<caret line="21" column="49" selection-start-line="21" selection-start-column="49" selection-end-line="21" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/Deamons/simple_mm.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="405">
+ <state relative-caret-position="621">
<caret line="27" column="7" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/Deamons/ngrok.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="307">
- <caret line="23" column="24" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
+ <state relative-caret-position="376">
+ <caret line="26" column="18" selection-start-line="26" selection-start-column="18" selection-end-line="26" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/ApiController/barong.rb">
<provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+ <state relative-caret-position="290">
+ <caret line="116" column="81" selection-start-line="116" selection-start-column="81" selection-end-line="116" selection-end-column="81" />
+=======
<state relative-caret-position="315">
<caret line="21" column="56" selection-start-line="21" selection-start-column="56" selection-end-line="21" selection-end-column="56" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
+ <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+ <state relative-caret-position="506">
+ <caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
+=======
+ <state relative-caret-position="540">
+ <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/lib/Deamons/litecoind.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="27" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/bin/console">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/bin/setup">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/exe/SimBot">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
<entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="8" lean-forward="true" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/SimBot.gemspec">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="690">
+ <state relative-caret-position="450">
<caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="115">
+ <state relative-caret-position="75">
<caret line="5" column="6" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.ruby-version">
@@ -580,55 +790,95 @@
<state>
<caret column="10" selection-start-column="10" selection-end-column="10" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
+ <entry file="file://$PROJECT_DIR$/.ruby-gemset">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="644">
- <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
+ <state>
+ <caret column="13" selection-start-column="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind.rb">
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="92">
+ <state relative-caret-position="60">
<caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
+ <entry file="file://$PROJECT_DIR$/.idea/.rakeTasks">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="322">
- <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
+ <state relative-caret-position="105">
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/Deamons/bitcoind-abc.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="149">
- <caret line="25" selection-start-line="25" selection-end-line="25" />
+<<<<<<< HEAD
+ <state relative-caret-position="1173">
+ <caret line="63" column="15" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="15" />
+=======
+ <state relative-caret-position="285">
+ <caret line="19" column="72" selection-start-line="19" selection-start-column="72" selection-end-line="19" selection-end-column="72" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/Deamons/wash_trade.rb">
+ <entry file="file://$PROJECT_DIR$/lib/Deamons/geth.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-398">
- <caret line="18" column="13" lean-forward="true" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+<<<<<<< HEAD
+ <state relative-caret-position="345">
+ <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
+=======
+ <state relative-caret-position="420">
+ <caret line="28" column="30" selection-start-line="28" selection-start-column="30" selection-end-line="28" selection-end-column="30" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
+ <entry file="file://$PROJECT_DIR$/lib/utils.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="46">
- <caret line="2" column="3" lean-forward="true" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
+<<<<<<< HEAD
+ <state relative-caret-position="667">
+ <caret line="29" column="19" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
+=======
+ <state relative-caret-position="-1675">
+ <caret line="100" column="64" selection-start-line="100" selection-start-column="64" selection-end-line="100" selection-end-column="64" />
+>>>>>>> 4db61f0fdbc0c3e31ccf7c36d60a06faa47a616f
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/lib/utils.rb">
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
+ <state relative-caret-position="120">
+ <caret line="8" column="93" selection-start-line="8" selection-start-column="93" selection-end-line="8" selection-end-column="93" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="210">
+ <caret line="14" selection-start-line="14" selection-end-line="14" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/SimBot.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="195">
+ <caret line="13" column="39" lean-forward="true" selection-start-line="13" selection-start-column="39" selection-end-line="13" selection-end-column="39" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/SimBot/version.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="23">
+ <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file