ssMerge branch 'master' of ssh://git.smartsoltech.kr:2222/trevor/woman_safety_app
This commit is contained in:
4
.idea/misc.xml
generated
4
.idea/misc.xml
generated
@@ -1,3 +1,7 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
>>>>>>> 198d43db29cb709eaba6466e4d4490c76c01bb2d
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
|
||||
|
||||
Reference in New Issue
Block a user