.idea/workspace.xml in ampedxx-yrpc-0.1.4 vs .idea/workspace.xml in ampedxx-yrpc-0.1.6
- old
+ new
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
+<<<<<<< HEAD
<list default="true" id="02e2ec4d-ca67-4b03-9858-19be219d43ba" name="Default" comment="" />
+=======
+ <list default="true" id="02e2ec4d-ca67-4b03-9858-19be219d43ba" name="Default" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/yrpc.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/yrpc.iml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" afterDir="false" />
+ </list>
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<ignored path="yrpc.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -21,66 +29,60 @@
<component name="FavoritesManager">
<favorites_list name="yrpc" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+<<<<<<< HEAD
<file leaf-file-name="configuration.rb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="9" column="15" lean-forward="false" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
+ <state relative-caret-position="858">
+ <caret line="39" column="22" lean-forward="false" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="yrpc.rb" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
+=======
+ <file leaf-file-name="client.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="481">
- <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="390">
+ <caret line="26" column="7" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="console" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/bin/console">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="66">
- <caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
- <folding />
- </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="154">
- <caret line="7" column="14" lean-forward="false" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
+<<<<<<< HEAD
<file leaf-file-name="yrpc.gemspec" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
+ <state relative-caret-position="330">
+ <caret line="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<folding />
+=======
+ <file leaf-file-name="autoload.rb" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="45">
+ <caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Rakefile" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/Rakefile">
+<<<<<<< HEAD
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/version.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
<folding />
+=======
+ <file leaf-file-name="yrpc.gemspec" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/yrpc.gemspec">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="480">
+ <caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
</file>
</leaf>
@@ -103,11 +105,14 @@
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/active_record.ipt.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/active_record.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/register.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/service.rb" />
<option value="$PROJECT_DIR$/bin/yrpc" />
+<<<<<<< HEAD
+=======
<option value="$PROJECT_DIR$/lib/yrpc/version.rb" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<option value="$PROJECT_DIR$/bin/yrpc-cli" />
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/base.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/server_interceptor.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/controllers/base.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/error/response_error.rb" />
@@ -117,26 +122,35 @@
<option value="$PROJECT_DIR$/lib/yrpc/interceptors/client_interceptor.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/executor/executor.rb" />
<option value="$PROJECT_DIR$/lib/yrpc.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/configuration.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/server.rb" />
+<<<<<<< HEAD
<option value="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/controllers/response.rb" />
<option value="$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb" />
<option value="$PROJECT_DIR$/Gemfile" />
<option value="$PROJECT_DIR$/yrpc.gemspec" />
+ <option value="$PROJECT_DIR$/lib/yrpc/version.rb" />
+=======
+ <option value="$PROJECT_DIR$/yrpc.gemspec" />
+ <option value="$PROJECT_DIR$/lib/yrpc/controllers/response.rb" />
+ <option value="$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb" />
+ <option value="$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
+<<<<<<< HEAD
<component name="ProjectFrameBounds">
- <option name="x" value="59" />
+ <option name="x" value="26" />
<option name="y" value="23" />
<option name="width" value="1614" />
<option name="height" value="948" />
</component>
<component name="ProjectView">
@@ -149,31 +163,70 @@
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
+=======
+ <component name="NodePackageJsonFileManager">
+ <packageJsonPaths />
+ </component>
+ <component name="ProjectFrameBounds">
+ <option name="y" value="23" />
+ <option name="width" value="1440" />
+ <option name="height" value="822" />
+ </component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
+<<<<<<< HEAD
+ <pane id="Scratches" />
+=======
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
<item name="yrpc" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
<item name="bin" type="462c0819:PsiDirectoryNode" />
+=======
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</path>
+ <path>
+ <item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
+ <item name="yrpc" type="462c0819:PsiDirectoryNode" />
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
+ </path>
+ <path>
+ <item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
+ <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+=======
+ <item name="yrpc" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="yrpc" type="b2602c69:ProjectViewProjectNode" />
+ <item name="yrpc" type="462c0819:PsiDirectoryNode" />
+ <item name="lib" type="462c0819:PsiDirectoryNode" />
+ <item name="yrpc" type="462c0819:PsiDirectoryNode" />
+ <item name="helpers" type="462c0819:PsiDirectoryNode" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
+ </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
<property name="settings.editor.splitter.proportion" value="0.2" />
@@ -198,10 +251,11 @@
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
+<<<<<<< HEAD
<component name="RunManager" selected="Ruby.yrpc">
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
@@ -328,38 +382,65 @@
<scripts />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
+=======
+ <component name="RunManager">
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<configuration name="yrpc" type="RubyRunConfigurationType" factoryName="Ruby" temporary="true">
<module name="yrpc" />
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/lib" />
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
+<<<<<<< HEAD
<envs />
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
+=======
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+ <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<COVERAGE_PATTERN ENABLED="true">
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
</COVERAGE_PATTERN>
</EXTENSION>
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/lib/yrpc.rb" />
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
</configuration>
+<<<<<<< HEAD
<recent_temporary>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="Ruby.yrpc" />
</list>
</recent_temporary>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SpringUtil" SPRING_PRE_LOADER_OPTION="false" />
+=======
+ <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+ <node-interpreter>project</node-interpreter>
+ <node-options />
+ <gulpfile />
+ <tasks />
+ <arguments />
+ <envs />
+ </configuration>
+ <recent_temporary>
+ <list>
+ <item itemvalue="Ruby.yrpc" />
+ </list>
+ </recent_temporary>
+ </component>
+ <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
@@ -371,43 +452,81 @@
<workItem from="1523176090405" duration="44763000" />
<workItem from="1523600534821" duration="8896000" />
<workItem from="1523840760162" duration="5943000" />
<workItem from="1524108216859" duration="1593000" />
<workItem from="1524208605755" duration="899000" />
+<<<<<<< HEAD
<workItem from="1526452353734" duration="2499000" />
<workItem from="1528269533806" duration="8000" />
<workItem from="1528336719873" duration="892000" />
<workItem from="1528338206952" duration="1888000" />
<workItem from="1528352272898" duration="279000" />
- <workItem from="1528358958154" duration="2565000" />
+ <workItem from="1528358958154" duration="2457000" />
+ <workItem from="1529894693130" duration="1941000" />
+ <workItem from="1529988973992" duration="965000" />
+=======
+ <workItem from="1526452353734" duration="3337000" />
+ <workItem from="1526549212564" duration="151000" />
+ <workItem from="1529980433193" duration="1463000" />
+ <workItem from="1529991223589" duration="284000" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="71209000" />
+<<<<<<< HEAD
+ <option name="totallyTimeSpent" value="73936000" />
</component>
<component name="ToolWindowManager">
- <frame x="59" y="23" width="1614" height="948" extended-state="0" />
+ <frame x="26" y="23" width="1614" height="948" extended-state="0" />
<layout>
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.283715" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28689566" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.32942554" sideWeight="0.50763357" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.49713877" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32942554" sideWeight="0.4923664" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3059789" sideWeight="0.4923664" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32936507" sideWeight="0.49713877" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32804233" sideWeight="0.4914163" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+=======
+ <option name="totallyTimeSpent" value="67329000" />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="0" y="23" width="1440" height="822" extended-state="0" />
+ <editor active="true" />
+ <layout>
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27825466" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info active="true" anchor="bottom" id="Messages" order="7" sideWeight="0.49713877" visible="true" weight="0.32936507" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50858366" side_tool="true" weight="0.32804233" />
+ <window_info anchor="right" id="Database" order="3" />
+ <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="7" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info anchor="bottom" id="Terminal" order="7" />
+ <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="Inspection" order="5" weight="0.4" />
+ <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="Run" order="2" sideWeight="0.49713877" weight="0.32936507" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4914163" visible="true" weight="0.32804233" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -420,10 +539,11 @@
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
+<<<<<<< HEAD
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
@@ -436,228 +556,378 @@
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="35" column="43" lean-forward="false" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+=======
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/request.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="915">
+ <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="10" selection-start-line="10" selection-end-line="10" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Gemfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/yrpc.gemspec">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="525">
+ <caret line="35" column="43" selection-start-line="35" selection-start-column="43" selection-end-line="35" selection-end-column="43" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
+<<<<<<< HEAD
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+=======
+ <caret line="24" selection-start-line="24" selection-end-line="24" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
+<<<<<<< HEAD
<caret line="4" column="94" lean-forward="false" selection-start-line="4" selection-start-column="94" selection-end-line="4" selection-end-column="94" />
+=======
+ <caret line="4" column="94" selection-start-line="4" selection-start-column="94" selection-end-line="4" selection-end-column="94" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
+<<<<<<< HEAD
<caret line="35" column="8" lean-forward="false" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
+=======
+ <caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/outbound/request_context.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
+<<<<<<< HEAD
<caret line="15" column="11" lean-forward="false" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
+=======
+ <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/client_interceptor.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465">
+<<<<<<< HEAD
<caret line="31" column="7" lean-forward="false" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
+=======
+ <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/server.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
+<<<<<<< HEAD
<caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+=======
+ <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
+<<<<<<< HEAD
<caret line="9" column="31" lean-forward="false" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="42" />
+=======
+ <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="42" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/request.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="915">
+<<<<<<< HEAD
<caret line="61" column="9" lean-forward="false" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+=======
+ <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
+<<<<<<< HEAD
<caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+=======
+ <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
+<<<<<<< HEAD
<caret line="17" column="9" lean-forward="false" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
+=======
+ <caret line="17" column="9" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="9" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
+<<<<<<< HEAD
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+=======
+ <caret line="24" selection-start-line="24" selection-end-line="24" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
+<<<<<<< HEAD
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
+=======
+ <provider selected="true" editor-type-id="text-editor" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
+<<<<<<< HEAD
<caret line="51" column="55" lean-forward="false" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="55" />
+=======
+ <caret line="51" column="55" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="55" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
+<<<<<<< HEAD
<caret line="35" column="8" lean-forward="false" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
+=======
+ <caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/register.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
+<<<<<<< HEAD
<caret line="25" column="7" lean-forward="false" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+=======
+ <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/base.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
+<<<<<<< HEAD
<caret line="14" column="9" lean-forward="false" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+=======
+ <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
+<<<<<<< HEAD
<caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+=======
+ <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
+<<<<<<< HEAD
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
+=======
+ <provider selected="true" editor-type-id="text-editor" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/active_record.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
+<<<<<<< HEAD
<caret line="19" column="19" lean-forward="false" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+=======
+ <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/error/response_error.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
+<<<<<<< HEAD
<caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+=======
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
+<<<<<<< HEAD
<caret line="14" column="36" lean-forward="false" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
+=======
+ <caret line="14" column="36" selection-start-line="14" selection-start-column="36" selection-end-line="14" selection-end-column="36" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/yrpc-cli">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
+<<<<<<< HEAD
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+=======
+ <caret line="16" selection-start-line="16" selection-end-line="16" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_HOME_DIR$/rubystubs23/condition_variable.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
+<<<<<<< HEAD
<caret line="31" column="6" lean-forward="false" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
+=======
+ <caret line="31" column="6" selection-start-line="31" selection-start-column="6" selection-end-line="31" selection-end-column="6" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/setup">
+<<<<<<< HEAD
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/yrpc" />
+=======
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/bin/yrpc" />
<entry file="file://$PROJECT_DIR$/lib/yrpc/version.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
- <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
+ <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
</state>
</provider>
</entry>
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/server_interceptor.rb" />
<entry file="file://$PROJECT_DIR$/lib/yrpc/error/response_error.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
+<<<<<<< HEAD
<caret line="1" column="14" lean-forward="false" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+=======
+ <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/active_record.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
+<<<<<<< HEAD
<caret line="19" column="19" lean-forward="false" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+=======
+ <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/yrpc-cli">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
+<<<<<<< HEAD
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+=======
+ <caret line="16" selection-start-line="16" selection-end-line="16" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/base.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
+<<<<<<< HEAD
<caret line="14" column="9" lean-forward="false" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+=======
+ <caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/register.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
+<<<<<<< HEAD
<caret line="25" column="7" lean-forward="false" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+=======
+ <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/interceptors/client_interceptor.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465">
+<<<<<<< HEAD
<caret line="31" column="7" lean-forward="false" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
@@ -676,37 +946,56 @@
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
+=======
+ <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="13" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="135">
+ <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="42" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/server.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
+<<<<<<< HEAD
<caret line="15" column="22" lean-forward="false" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+=======
+ <caret line="15" column="22" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/request.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
+<<<<<<< HEAD
<caret line="61" column="9" lean-forward="false" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+=======
+ <caret line="61" column="9" selection-start-line="61" selection-start-column="9" selection-end-line="61" selection-end-column="9" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/outbound/request_context.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-420">
+<<<<<<< HEAD
<caret line="15" column="11" lean-forward="false" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/response.rb">
@@ -732,50 +1021,120 @@
</entry>
<entry file="file://$PROJECT_DIR$/bin/console">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
- <folding />
+=======
+ <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/base.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="210">
+ <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/response.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1500">
+ <caret line="100" column="7" selection-start-line="100" selection-start-column="7" selection-end-line="100" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Gemfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/controllers/service_binder.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="780">
+ <caret line="53" column="24" selection-start-line="53" selection-start-column="24" selection-end-line="53" selection-end-column="24" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc.rb">
<provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
<state relative-caret-position="481">
<caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/Rakefile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="22">
+ <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/Gemfile">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="154">
+ <caret line="7" column="14" lean-forward="true" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/lib/yrpc/configuration.rb">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="9" column="15" lean-forward="false" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
+ <state relative-caret-position="858">
+ <caret line="39" column="22" lean-forward="false" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Rakefile">
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/version.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Gemfile">
+ <entry file="file://$PROJECT_DIR$/yrpc.gemspec">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="154">
- <caret line="7" column="14" lean-forward="false" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
+ <state relative-caret-position="330">
+ <caret line="15" column="31" lean-forward="false" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<folding />
+=======
+ <state relative-caret-position="360">
+ <caret line="24" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/client.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="390">
+ <caret line="26" column="7" selection-start-line="26" selection-start-column="7" selection-end-line="26" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/executor/executor.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="285">
+ <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/yrpc.gemspec">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="198">
- <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="480">
+ <caret line="32" column="54" selection-start-line="32" selection-start-column="54" selection-end-line="32" selection-end-column="54" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/lib/yrpc/helpers/autoload.rb">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="45">
+ <caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
+>>>>>>> ca7db938feed1e073c1384610a8e00dfe32459b9
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file