resolve conflicts

This commit is contained in:
Rashed
2023-03-01 10:07:33 +03:00
parent 67e6349877
commit 855b2ff5b1
9 changed files with 34 additions and 9 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.8.0" />
<option name="version" value="1.8.10" />
</component>
</project>