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"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" project-jdk-name="Python 3.9" project-jdk-type="Python SDK">
<output url="file://$PROJECT_DIR$/out" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (nlp)" project-jdk-type="Python SDK" />
\ No newline at end of file
......@@ -2,8 +2,10 @@
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" />
<orderEntry type="jdk" jdkName="Python 3.9 (nlp)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
\ 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