|
@ -7,8 +7,13 @@ |
|
|
<list default="true" id="e096f643-4c6b-4769-84b8-63aa85cd1521" name="Changes" comment=""> |
|
|
<list default="true" id="e096f643-4c6b-4769-84b8-63aa85cd1521" name="Changes" comment=""> |
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> |
|
|
|
|
|
<<<<<<< HEAD |
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/security/WebSecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/security/WebSecurityConfig.java" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/security/WebSecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/security/WebSecurityConfig.java" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" /> |
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" /> |
|
|
|
|
|
======= |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/controller/UsersController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/controller/UsersController.java" afterDir="false" /> |
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/service/UsersService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/waterproofingdata/wpdauth/service/UsersService.java" afterDir="false" /> |
|
|
|
|
|
>>>>>>> d3130ef8cd7f2e24330f0fdefbf64b99d1f1a249 |
|
|
</list> |
|
|
</list> |
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
<option name="SHOW_DIALOG" value="false" /> |
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" /> |
|
@ -30,15 +35,16 @@ |
|
|
<component name="MarkdownSettingsMigration"> |
|
|
<component name="MarkdownSettingsMigration"> |
|
|
<option name="stateVersion" value="1" /> |
|
|
<option name="stateVersion" value="1" /> |
|
|
</component> |
|
|
</component> |
|
|
<component name="ProjectColorInfo">{ |
|
|
|
|
|
"associatedIndex": 8 |
|
|
|
|
|
}</component> |
|
|
|
|
|
|
|
|
<component name="ProjectColorInfo"><![CDATA[{ |
|
|
|
|
|
"associatedIndex": 0 |
|
|
|
|
|
}]]></component> |
|
|
<component name="ProjectId" id="2QZB1w4yMqJ44pz7TgaoomMXRlQ" /> |
|
|
<component name="ProjectId" id="2QZB1w4yMqJ44pz7TgaoomMXRlQ" /> |
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> |
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> |
|
|
<component name="ProjectViewState"> |
|
|
<component name="ProjectViewState"> |
|
|
<option name="hideEmptyMiddlePackages" value="true" /> |
|
|
<option name="hideEmptyMiddlePackages" value="true" /> |
|
|
<option name="showLibraryContents" value="true" /> |
|
|
<option name="showLibraryContents" value="true" /> |
|
|
</component> |
|
|
</component> |
|
|
|
|
|
<<<<<<< HEAD |
|
|
<component name="PropertiesComponent">{ |
|
|
<component name="PropertiesComponent">{ |
|
|
"keyToString": { |
|
|
"keyToString": { |
|
|
"RunOnceActivity.OpenProjectViewOnStart": "true", |
|
|
"RunOnceActivity.OpenProjectViewOnStart": "true", |
|
@ -52,6 +58,21 @@ |
|
|
"node.js.selected.package.tslint": "(autodetect)", |
|
|
"node.js.selected.package.tslint": "(autodetect)", |
|
|
"nodejs_package_manager_path": "npm", |
|
|
"nodejs_package_manager_path": "npm", |
|
|
"settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices" |
|
|
"settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices" |
|
|
|
|
|
======= |
|
|
|
|
|
<component name="PropertiesComponent"><![CDATA[{ |
|
|
|
|
|
"keyToString": { |
|
|
|
|
|
"RunOnceActivity.OpenProjectViewOnStart": "true", |
|
|
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true", |
|
|
|
|
|
"WebServerToolWindowFactoryState": "false", |
|
|
|
|
|
"git-widget-placeholder": "main", |
|
|
|
|
|
"last_opened_file_path": "C:/xampp/htdocs/java-wpd-auth/WPD-Auth-PR/WPD-Auth", |
|
|
|
|
|
"node.js.detected.package.eslint": "true", |
|
|
|
|
|
"node.js.detected.package.tslint": "true", |
|
|
|
|
|
"node.js.selected.package.eslint": "(autodetect)", |
|
|
|
|
|
"node.js.selected.package.tslint": "(autodetect)", |
|
|
|
|
|
"nodejs_package_manager_path": "npm", |
|
|
|
|
|
"settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices" |
|
|
|
|
|
>>>>>>> d3130ef8cd7f2e24330f0fdefbf64b99d1f1a249 |
|
|
} |
|
|
} |
|
|
}</component> |
|
|
}</component> |
|
|
<component name="RecentsManager"> |
|
|
<component name="RecentsManager"> |
|
|