Merge remote-tracking branch 'origin/master' #2

Open
kromskii2 wants to merge 2 commits from 4.0 into master
pull from: 4.0
2 changed files with 9 additions and 12 deletions
Showing only changes of commit 17ac37a683 - Show all commits

No files matched your search

+6 -12
View File
@@ -2,7 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8e138aa4-7ed1-4694-a1ba-e76425f75da1" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config.ini" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,6 +26,11 @@
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "master"
},
"keyToStringList": {
"ChangesTree.GroupingKeys": [
"directory"
]
}
}]]></component>
<component name="RunManager">
@@ -70,15 +75,4 @@
</task>
<servers />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>8</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>
+3
View File
@@ -0,0 +1,3 @@
api-"заполните"
bot-"заполните"
id-"заполните"