resolving conflicts

Leantime · Aug 23, 2024 · 26531b0 · 26531b0
1 parent ad4c21d
commit 26531b0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml