Merge remote-tracking branch 'origin/master'

This commit is contained in:
Maddie H 2022-09-21 16:53:49 +01:00
commit 7cd9df1e6b
No known key found for this signature in database
GPG Key ID: 64FAA9959751687D
9 changed files with 0 additions and 69 deletions

8
.idea/.gitignore vendored
View File

@ -1,8 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DiscordProjectSettings">
<option name="show" value="ASK" />
<option name="description" value="" />
</component>
</project>

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTreeColorHighlighter">
<files />
<colors>
<color id="1" value="#4f060d" name="Color 1" enabled="true" />
<color id="2" value="#44220e" name="Color 2" enabled="true" />
<color id="3" value="#3f371b" name="Color 3" enabled="true" />
<color id="4" value="#162c16" name="Color 4" enabled="true" />
<color id="5" value="#0f2f47" name="Color 5" enabled="true" />
<color id="6" value="#171a34" name="Color 6" enabled="true" />
<color id="7" value="#311333" name="Color 7" enabled="true" />
<color id="8" value="#1e1e1e" name="Color 8" enabled="true" />
</colors>
<option name="marksForCollapsedHighlights" value="Dots" />
</component>
</project>

View File

@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/resistors.iml" filepath="$PROJECT_DIR$/.idea/resistors.iml" />
</modules>
</component>
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>