You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
130 lines
6.2 KiB
130 lines
6.2 KiB
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="AutoImportSettings">
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
</component>
|
|
<component name="ChangeListManager">
|
|
<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$/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/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>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
<component name="FileTemplateManagerImpl">
|
|
<option name="RECENT_TEMPLATES">
|
|
<list>
|
|
<option value="Interface" />
|
|
<option value="AnnotationType" />
|
|
<option value="Class" />
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
</component>
|
|
<component name="MarkdownSettingsMigration">
|
|
<option name="stateVersion" value="1" />
|
|
</component>
|
|
<component name="ProjectColorInfo"><![CDATA[{
|
|
"associatedIndex": 0
|
|
}]]></component>
|
|
<component name="ProjectId" id="2QZB1w4yMqJ44pz7TgaoomMXRlQ" />
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
<component name="ProjectViewState">
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
<option name="showLibraryContents" value="true" />
|
|
</component>
|
|
<<<<<<< HEAD
|
|
<component name="PropertiesComponent">{
|
|
"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"
|
|
=======
|
|
<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 name="RecentsManager">
|
|
<key name="CreateClassDialog.RecentsKey">
|
|
<recent name="org.waterproofingdata.wpdauth.service" />
|
|
<recent name="org.waterproofingdata.wpdauth.controller" />
|
|
</key>
|
|
</component>
|
|
<component name="RunManager">
|
|
<configuration name="WpdauthApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="org.waterproofingdata.wpdauth.WpdauthApplication" />
|
|
<module name="wpdauth" />
|
|
<extension name="coverage">
|
|
<pattern>
|
|
<option name="PATTERN" value="org.waterproofingdata.wpdauth.*" />
|
|
<option name="ENABLED" value="true" />
|
|
</pattern>
|
|
</extension>
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<recent_temporary>
|
|
<list>
|
|
<item itemvalue="Application.WpdauthApplication" />
|
|
</list>
|
|
</recent_temporary>
|
|
</component>
|
|
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
<component name="TaskManager">
|
|
<task active="true" id="Default" summary="Default task">
|
|
<changelist id="e096f643-4c6b-4769-84b8-63aa85cd1521" name="Changes" comment="" />
|
|
<created>1685551011905</created>
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1685551011905</updated>
|
|
<workItem from="1685551016282" duration="3245000" />
|
|
</task>
|
|
<servers />
|
|
</component>
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<option name="version" value="3" />
|
|
</component>
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
<option name="TAB_STATES">
|
|
<map>
|
|
<entry key="MAIN">
|
|
<value>
|
|
<State />
|
|
</value>
|
|
</entry>
|
|
</map>
|
|
</option>
|
|
</component>
|
|
</project>
|