Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/vcs.xml
计算器（w
1 changed files with 4 additions and 1 deletions
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -2,7 +2,10 @@
 <project version="4">
  <component name="GitSharedSettings">
    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list />
+      <list>
+        <option value="main" />
+        <option value="master" />
+      </list>
    </option>
  </component>
  <component name="VcsDirectoryMappings">
Author	SHA1	Message	Date
wjy	6c3fa7d4b3	Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/vcs.xml	5 months ago
wjy	a36fb7e423	计算器（w	5 months ago