Commit 07536c13 authored by Tim Seegmüller's avatar Tim Seegmüller
Browse files

[fix,#58] rebase and resolved conflicts

parent d0a88176
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="Python 3.9" project-jdk-type="Python SDK"> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (nlp)" project-jdk-type="Python SDK" />
<output url="file://$PROJECT_DIR$/out" /> </project>
</component> \ No newline at end of file
</project>
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
<module type="PYTHON_MODULE" version="4"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$">
<orderEntry type="inheritedJdk" /> <excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="jdk" jdkName="Python 3.9 (nlp)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment