合并代码。解决冲突
This commit is contained in:
5
.idea/inspectionProfiles/Project_Default.xml
generated
5
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -4,8 +4,11 @@
|
||||
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="ignoredPackages">
|
||||
<value>
|
||||
<list size="1">
|
||||
<list size="4">
|
||||
<item index="0" class="java.lang.String" itemvalue="PySide6" />
|
||||
<item index="1" class="java.lang.String" itemvalue="pyusb" />
|
||||
<item index="2" class="java.lang.String" itemvalue="PyGObject-stubs" />
|
||||
<item index="3" class="java.lang.String" itemvalue="PyGObject" />
|
||||
</list>
|
||||
</value>
|
||||
</option>
|
||||
|
||||
Reference in New Issue
Block a user