diff options
| author | roy lewin <roy.lewin@gmail.com> | 2016-09-22 01:58:05 +0300 |
|---|---|---|
| committer | roy lewin <roy.lewin@gmail.com> | 2016-09-22 01:58:05 +0300 |
| commit | 733afb1109a06f89af68e8660728f1b4bbbdab1a (patch) | |
| tree | ec4c965bea61228c55a7c4c68e1be86446291620 /.idea/misc.xml | |
| parent | 652781137f3856fef98e3063766f9f3b1a984a2e (diff) | |
| parent | 081eac29a20ab8485f2b8180654a6d4b808e2df7 (diff) | |
Merge branch 'master' of https://bitbucket.org/lib_2_wiki/parser
# Conflicts:
# .idea/misc.xml
# .idea/workspace.xml
# parsers/INL_xml_parser.py
Diffstat (limited to '.idea/misc.xml')
| -rw-r--r-- | .idea/misc.xml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.idea/misc.xml b/.idea/misc.xml index f38dd77..df245c4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.10 (C:\Python27\python.exe)" project-jdk-type="Python SDK" /> - <component name="PythonCompatibilityInspectionAdvertiser"> - <option name="version" value="1" /> + <component name="ProjectLevelVcsManager" settingsEditedManually="false"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> </component> + <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.10 (C:\Python27\python.exe)" project-jdk-type="Python SDK" /> </project>
\ No newline at end of file |