| | |
| | | <?xml version="1.0" encoding="UTF-8"?> |
| | | <project version="4"> |
| | | <component name="ChangeListManager"> |
| | | <list default="true" id="becdd117-1021-4e06-af58-0f70d982f4ee" name="Default Changelist" comment="" /> |
| | | <list default="true" id="becdd117-1021-4e06-af58-0f70d982f4ee" name="Default Changelist" comment=""> |
| | | <<<<<<< HEAD |
| | | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| | | <change beforePath="$PROJECT_DIR$/sdk.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/sdk.pb.go" afterDir="false" /> |
| | | <change beforePath="$PROJECT_DIR$/sdk.proto" beforeDir="false" afterPath="$PROJECT_DIR$/sdk.proto" afterDir="false" /> |
| | | <change beforePath="$PROJECT_DIR$/sysset.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/sysset.pb.go" afterDir="false" /> |
| | | ======= |
| | | <change beforePath="$PROJECT_DIR$/protomsg.proto" beforeDir="false" afterPath="$PROJECT_DIR$/protomsg.proto" afterDir="false" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | </list> |
| | | <option name="EXCLUDED_CONVERTED_TO_IGNORED" 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="FUSProjectUsageTrigger"> |
| | | <session id="1047889122"> |
| | | <usages-collector id="statistics.file.extensions.open"> |
| | | <counts> |
| | | <entry key="proto" value="1" /> |
| | | </counts> |
| | | </usages-collector> |
| | | <usages-collector id="statistics.file.types.open"> |
| | | <counts> |
| | | <entry key="PROTO" value="1" /> |
| | | </counts> |
| | | </usages-collector> |
| | | <usages-collector id="statistics.file.extensions.edit"> |
| | | <counts> |
| | | <entry key="proto" value="352" /> |
| | | </counts> |
| | | </usages-collector> |
| | | <usages-collector id="statistics.file.types.edit"> |
| | | <counts> |
| | | <entry key="PROTO" value="352" /> |
| | | </counts> |
| | | </usages-collector> |
| | | <usages-collector id="statistics.lifecycle.project"> |
| | | <counts> |
| | | <entry key="project.closed" value="2" /> |
| | | <entry key="project.open.time.1" value="1" /> |
| | | <entry key="project.open.time.11" value="1" /> |
| | | <entry key="project.open.time.2" value="1" /> |
| | | <entry key="project.open.time.23" value="1" /> |
| | | <entry key="project.opened" value="4" /> |
| | | </counts> |
| | | </usages-collector> |
| | | </session> |
| | | </component> |
| | | <component name="FileEditorManager"> |
| | | <<<<<<< HEAD |
| | | <leaf SIDE_TABS_SIZE_LIMIT_KEY="375"> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <file pinned="false" current-in-tab="true"> |
| | | <entry file="file://$PROJECT_DIR$/sdk.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="420"> |
| | | <caret line="69" column="25" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" /> |
| | | <state relative-caret-position="258"> |
| | | <caret line="75" column="42" lean-forward="true" selection-start-line="75" selection-start-column="42" selection-end-line="75" selection-end-column="42" /> |
| | | ======= |
| | | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| | | <file pinned="false" current-in-tab="true"> |
| | | <entry file="file://$PROJECT_DIR$/protomsg.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="319"> |
| | | <caret line="195" column="18" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="true"> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <entry file="file://$PROJECT_DIR$/base.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="76"> |
| | | <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <<<<<<< HEAD |
| | | <entry file="file://$PROJECT_DIR$/sdk.pb.go"> |
| | | ======= |
| | | <entry file="file://$PROJECT_DIR$/.gitignore"> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | <provider selected="true" editor-type-id="text-editor" /> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <<<<<<< HEAD |
| | | <entry file="file://$PROJECT_DIR$/protomsg.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="301"> |
| | | <caret line="213" column="20" lean-forward="true" selection-start-line="213" selection-start-column="20" selection-end-line="213" selection-end-column="20" /> |
| | | <state relative-caret-position="343"> |
| | | <caret line="180" column="30" selection-start-line="180" selection-start-column="30" selection-end-line="180" selection-end-column="30" /> |
| | | ======= |
| | | <entry file="file://$PROJECT_DIR$/videoperson.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="399"> |
| | | <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <entry file="file://$PROJECT_DIR$/protomsg.pb.go"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="41667"> |
| | | <caret line="2200" column="13" selection-start-line="2200" selection-start-column="13" selection-end-line="2200" selection-end-column="13" /> |
| | | <folding> |
| | | <element signature="e#96#237#0" expanded="true" /> |
| | | </folding> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <entry file="file://$PROJECT_DIR$/commsg.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="152"> |
| | | <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <entry file="file://$PROJECT_DIR$/base.pb.go"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="931"> |
| | | <caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" /> |
| | | <folding> |
| | | <element signature="e#92#175#0" expanded="true" /> |
| | | </folding> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <entry file="file://$PROJECT_DIR$/sysset.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state> |
| | | <caret selection-end-line="2" selection-end-column="17" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | <file pinned="false" current-in-tab="false"> |
| | | <entry file="file://$PROJECT_DIR$/es.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="152"> |
| | | <caret line="8" column="27" lean-forward="true" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | </file> |
| | | </leaf> |
| | | </component> |
| | | <component name="FindInProjectRecents"> |
| | | <findStrings> |
| | | <find>Point</find> |
| | | <find>float</find> |
| | | <find>EsPersonCacheChange</find> |
| | | <find>SdkRule</find> |
| | | <find>enum</find> |
| | | <find>sdkCompareR</find> |
| | | <find>SdkCompareEach</find> |
| | | </findStrings> |
| | | </component> |
| | | <component name="GOROOT" path="D:\Go" /> |
| | | <component name="Git.Settings"> |
| | |
| | | <component name="IdeDocumentHistory"> |
| | | <option name="CHANGED_PATHS"> |
| | | <list> |
| | | <option value="$PROJECT_DIR$/sysset.proto" /> |
| | | <option value="$PROJECT_DIR$/videoperson.proto" /> |
| | | <option value="$PROJECT_DIR$/es.proto" /> |
| | | <option value="$PROJECT_DIR$/protomsg.proto" /> |
| | | <<<<<<< HEAD |
| | | <option value="$PROJECT_DIR$/sdk.proto" /> |
| | | ======= |
| | | </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> |
| | | <component name="ProjectConfigurationFiles"> |
| | | <option name="files"> |
| | |
| | | <option value="$PROJECT_DIR$/.idea/vcs.xml" /> |
| | | <option value="$PROJECT_DIR$/.idea/misc.xml" /> |
| | | <option value="$PROJECT_DIR$/.idea/modules.xml" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | </list> |
| | | </option> |
| | | </component> |
| | | <component name="ProjectFrameBounds" extendedState="6"> |
| | | <option name="x" value="260" /> |
| | | <option name="y" value="80" /> |
| | | <option name="width" value="1400" /> |
| | | <option name="height" value="1000" /> |
| | | <component name="ProjectFrameBounds"> |
| | | <option name="x" value="8" /> |
| | | <option name="y" value="83" /> |
| | | <option name="width" value="1678" /> |
| | | <option name="height" value="1047" /> |
| | | </component> |
| | | <component name="ProjectView"> |
| | | <navigator proportions="" version="1"> |
| | | <foldersAlwaysOnTop value="true" /> |
| | | </navigator> |
| | | <panes> |
| | | <pane id="ProjectPane" /> |
| | | <<<<<<< HEAD |
| | | <pane id="ProjectPane"> |
| | | <subPane> |
| | | <expand> |
| | | <path> |
| | | <item name="protomsg" type="b2602c69:ProjectViewProjectNode" /> |
| | | <item name="protomsg" type="462c0819:PsiDirectoryNode" /> |
| | | </path> |
| | | </expand> |
| | | <select /> |
| | | </subPane> |
| | | </pane> |
| | | ======= |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | <pane id="Scope" /> |
| | | <pane id="PackagesPane" /> |
| | | <pane id="ProjectPane"> |
| | | <subPane> |
| | | <expand> |
| | | <path> |
| | | <item name="protomsg" type="b2602c69:ProjectViewProjectNode" /> |
| | | <item name="protomsg" type="462c0819:PsiDirectoryNode" /> |
| | | </path> |
| | | </expand> |
| | | <select /> |
| | | </subPane> |
| | | </pane> |
| | | </panes> |
| | | </component> |
| | | <component name="PropertiesComponent"> |
| | | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
| | | <property name="WebServerToolWindowFactoryState" value="false" /> |
| | | <property name="aspect.path.notification.shown" value="true" /> |
| | | <property name="go.gopath.indexing.explicitly.defined" value="true" /> |
| | | <property name="go.import.settings.migrated" value="true" /> |
| | | <property name="go.sdk.automatically.set" value="true" /> |
| | | <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="go.vgo" /> |
| | | </component> |
| | | <component name="RunDashboard"> |
| | | <option name="ruleStates"> |
| | |
| | | </list> |
| | | </option> |
| | | </component> |
| | | <component name="SvnConfiguration"> |
| | | <configuration /> |
| | | </component> |
| | | <component name="TaskManager"> |
| | | <task active="true" id="Default" summary="Default task"> |
| | | <changelist id="becdd117-1021-4e06-af58-0f70d982f4ee" name="Default Changelist" comment="" /> |
| | | <created>1563790157452</created> |
| | | <option name="number" value="Default" /> |
| | | <option name="presentableId" value="Default" /> |
| | | <updated>1563790157452</updated> |
| | | <workItem from="1563790158906" duration="685000" /> |
| | | <workItem from="1563933935696" duration="7991000" /> |
| | | <workItem from="1564104352978" duration="17732000" /> |
| | | <workItem from="1564968876353" duration="2244000" /> |
| | | <workItem from="1565313761365" duration="597000" /> |
| | | <workItem from="1565337974976" duration="1231000" /> |
| | | <workItem from="1565955759598" duration="7348000" /> |
| | | </task> |
| | | <servers /> |
| | | </component> |
| | | <component name="TimeTrackingManager"> |
| | | <option name="totallyTimeSpent" value="36504000" /> |
| | | </component> |
| | | <component name="ToolWindowManager"> |
| | | <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" /> |
| | | <frame x="8" y="83" width="1678" height="1047" extended-state="0" /> |
| | | <editor active="true" /> |
| | | <layout> |
| | | <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19796138" /> |
| | | <<<<<<< HEAD |
| | | <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20064378" /> |
| | | ======= |
| | | <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31211373" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| | | <window_info id="Favorites" order="2" side_tool="true" /> |
| | | <window_info id="Image Layers" order="2" /> |
| | | <window_info id="Designer" order="3" /> |
| | | <window_info id="UI Designer" order="4" /> |
| | | <window_info id="Capture Tool" order="5" /> |
| | | <window_info id="Favorites" order="6" side_tool="true" /> |
| | | <window_info anchor="bottom" id="Message" order="0" /> |
| | | <window_info anchor="bottom" id="Find" order="1" /> |
| | | <window_info anchor="bottom" id="Run" order="2" /> |
| | |
| | | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
| | | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
| | | <window_info anchor="bottom" id="TODO" order="6" /> |
| | | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
| | | <window_info anchor="bottom" id="Database Changes" order="8" /> |
| | | <window_info anchor="bottom" id="Version Control" order="9" /> |
| | | <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.36568627" /> |
| | | <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> |
| | | <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> |
| | | <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.30405405" /> |
| | | <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> |
| | | <window_info anchor="bottom" id="Version Control" order="10" /> |
| | | <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="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
| | | <window_info anchor="right" id="Database" order="3" /> |
| | | <window_info anchor="right" id="Palette" order="3" /> |
| | | <window_info anchor="right" id="Capture Analysis" order="4" /> |
| | | <window_info anchor="right" id="Theme Preview" order="5" /> |
| | | <window_info anchor="right" id="Palette	" order="6" /> |
| | | <window_info anchor="right" id="Database" order="7" /> |
| | | <window_info anchor="right" id="Maven Projects" order="8" /> |
| | | </layout> |
| | | </component> |
| | | <component name="TypeScriptGeneratedFilesManager"> |
| | | <option name="version" value="1" /> |
| | | </component> |
| | | <<<<<<< HEAD |
| | | <component name="VgoProject"> |
| | | <integration-enabled>true</integration-enabled> |
| | | ======= |
| | | <component name="VcsContentAnnotationSettings"> |
| | | <option name="myLimit" value="2678400000" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | </component> |
| | | <component name="editorHistoryManager"> |
| | | <entry file="file://$PROJECT_DIR$/protomsg.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <<<<<<< HEAD |
| | | <state relative-caret-position="343"> |
| | | <caret line="180" column="30" selection-start-line="180" selection-start-column="30" selection-end-line="180" selection-end-column="30" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/sdk.pb.go"> |
| | | <provider selected="true" editor-type-id="text-editor" /> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/sdk.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="420"> |
| | | <state relative-caret-position="258"> |
| | | <caret line="75" column="42" lean-forward="true" selection-start-line="75" selection-start-column="42" selection-end-line="75" selection-end-column="42" /> |
| | | ======= |
| | | <state relative-caret-position="1311"> |
| | | <caret line="69" column="25" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/base.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="76"> |
| | | <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/.gitignore"> |
| | | <provider selected="true" editor-type-id="text-editor" /> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/videoperson.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="399"> |
| | | <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/protomsg.pb.go"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="41667"> |
| | | <caret line="2200" column="13" selection-start-line="2200" selection-start-column="13" selection-end-line="2200" selection-end-column="13" /> |
| | | <folding> |
| | | <element signature="e#96#237#0" expanded="true" /> |
| | | </folding> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/commsg.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="152"> |
| | | <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/base.pb.go"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="931"> |
| | | <caret line="54" column="19" selection-start-line="54" selection-start-column="19" selection-end-line="54" selection-end-column="19" /> |
| | | <folding> |
| | | <element signature="e#92#175#0" expanded="true" /> |
| | | </folding> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/sysset.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state> |
| | | <caret selection-end-line="2" selection-end-column="17" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/es.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="152"> |
| | | <caret line="8" column="27" lean-forward="true" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" /> |
| | | </state> |
| | | </provider> |
| | | </entry> |
| | | <entry file="file://$PROJECT_DIR$/protomsg.proto"> |
| | | <provider selected="true" editor-type-id="text-editor"> |
| | | <state relative-caret-position="301"> |
| | | <caret line="213" column="20" lean-forward="true" selection-start-line="213" selection-start-column="20" selection-end-line="213" selection-end-column="20" /> |
| | | <state relative-caret-position="319"> |
| | | <caret line="195" column="18" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" /> |
| | | >>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6 |
| | | </state> |
| | | </provider> |
| | | </entry> |