casa6
Public
Commits
Takahiro Tsutsumi authored 70c97a79634 Merge
| 1 + | |
| 2 + | <project version="4"> |
| 3 + | <component name="AutoImportSettings"> |
| 4 + | <option name="autoReloadType" value="SELECTIVE" /> |
| 5 + | </component> |
| 6 + | <component name="ChangeListManager"> |
| 7 + | <list default="true" id="88941e50-8eaa-4324-baeb-28c676d33da6" name="Changes" comment="merge trunk changes"> |
| 8 + | <change beforePath="$PROJECT_DIR$/casatasks/src/private/userconfig.py" beforeDir="false" afterPath="$PROJECT_DIR$/casatasks/src/private/userconfig.py" afterDir="false" /> |
| 9 + | <change beforePath="$PROJECT_DIR$/casatools/src/python/ctuser.py" beforeDir="false" afterPath="$PROJECT_DIR$/casatools/src/python/ctuser.py" afterDir="false" /> |
| 10 + | </list> |
| 11 + | <option name="SHOW_DIALOG" value="false" /> |
| 12 + | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
| 13 + | <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> |
| 14 + | <option name="LAST_RESOLUTION" value="IGNORE" /> |
| 15 + | </component> |
| 16 + | <component name="Git.Settings"> |
| 17 + | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 18 + | </component> |
| 19 + | <component name="MarkdownSettingsMigration"> |
| 20 + | <option name="stateVersion" value="1" /> |
| 21 + | </component> |
| 22 + | <component name="ProjectId" id="25kYZHLHBxFWUksOtbulLzxAqtE" /> |
| 23 + | <component name="ProjectViewState"> |
| 24 + | <option name="hideEmptyMiddlePackages" value="true" /> |
| 25 + | <option name="showLibraryContents" value="true" /> |
| 26 + | </component> |
| 27 + | <component name="PropertiesComponent"> |
| 28 + | <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> |
| 29 + | <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> |
| 30 + | <property name="last_opened_file_path" value="$PROJECT_DIR$" /> |
| 31 + | </component> |
| 32 + | <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> |
| 33 + | <component name="TaskManager"> |
| 34 + | <task active="true" id="Default" summary="Default task"> |
| 35 + | <changelist id="88941e50-8eaa-4324-baeb-28c676d33da6" name="Changes" comment="" /> |
| 36 + | <created>1646072605258</created> |
| 37 + | <option name="number" value="Default" /> |
| 38 + | <option name="presentableId" value="Default" /> |
| 39 + | <updated>1646072605258</updated> |
| 40 + | </task> |
| 41 + | <servers /> |
| 42 + | </component> |
| 43 + | <component name="Vcs.Log.Tabs.Properties"> |
| 44 + | <option name="TAB_STATES"> |
| 45 + | <map> |
| 46 + | <entry key="MAIN"> |
| 47 + | <value> |
| 48 + | <State /> |
| 49 + | </value> |
| 50 + | </entry> |
| 51 + | </map> |
| 52 + | </option> |
| 53 + | </component> |
| 54 + | <component name="VcsManagerConfiguration"> |
| 55 + | <MESSAGE value="merge trunk changes" /> |
| 56 + | <option name="LAST_COMMIT_MESSAGE" value="merge trunk changes" /> |
| 57 + | </component> |
| 58 + | </project> |