Paddy/Betterzon
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2026-05-26 20:38:05 +00:00
Code Issues Projects Releases Wiki Activity

Fixing conflict

Browse Source
This commit is contained in:
Patrick Müller
2020-12-02 18:54:38 +01:00
parent 692ace9701 8c45162736
commit dab6217436
45 changed files with 9435 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frontend/Frontend.iml
+1 -1
View File
@@ -3,8 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/e2e" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/e2e" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />