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.

129 lines
6.2 KiB

  1. <?xml version="1.0" encoding="UTF-8"?>
  2. <project version="4">
  3. <component name="AutoImportSettings">
  4. <option name="autoReloadType" value="SELECTIVE" />
  5. </component>
  6. <component name="ChangeListManager">
  7. <list default="true" id="e096f643-4c6b-4769-84b8-63aa85cd1521" name="Changes" comment="">
  8. <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  9. <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
  10. <<<<<<< HEAD
  11. <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" />
  12. <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
  13. =======
  14. <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" />
  15. <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" />
  16. >>>>>>> d3130ef8cd7f2e24330f0fdefbf64b99d1f1a249
  17. </list>
  18. <option name="SHOW_DIALOG" value="false" />
  19. <option name="HIGHLIGHT_CONFLICTS" value="true" />
  20. <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
  21. <option name="LAST_RESOLUTION" value="IGNORE" />
  22. </component>
  23. <component name="FileTemplateManagerImpl">
  24. <option name="RECENT_TEMPLATES">
  25. <list>
  26. <option value="Interface" />
  27. <option value="AnnotationType" />
  28. <option value="Class" />
  29. </list>
  30. </option>
  31. </component>
  32. <component name="Git.Settings">
  33. <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  34. </component>
  35. <component name="MarkdownSettingsMigration">
  36. <option name="stateVersion" value="1" />
  37. </component>
  38. <component name="ProjectColorInfo"><![CDATA[{
  39. "associatedIndex": 0
  40. }]]></component>
  41. <component name="ProjectId" id="2QZB1w4yMqJ44pz7TgaoomMXRlQ" />
  42. <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  43. <component name="ProjectViewState">
  44. <option name="hideEmptyMiddlePackages" value="true" />
  45. <option name="showLibraryContents" value="true" />
  46. </component>
  47. <<<<<<< HEAD
  48. <component name="PropertiesComponent">{
  49. &quot;keyToString&quot;: {
  50. &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
  51. &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
  52. &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
  53. &quot;git-widget-placeholder&quot;: &quot;main&quot;,
  54. &quot;last_opened_file_path&quot;: &quot;C:/xampp/htdocs/java-wpd-auth/WPD-Auth-PR/WPD-Auth&quot;,
  55. &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
  56. &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
  57. &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
  58. &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
  59. &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
  60. &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.repository.indices&quot;
  61. =======
  62. <component name="PropertiesComponent"><![CDATA[{
  63. "keyToString": {
  64. "RunOnceActivity.OpenProjectViewOnStart": "true",
  65. "RunOnceActivity.ShowReadmeOnStart": "true",
  66. "WebServerToolWindowFactoryState": "false",
  67. "git-widget-placeholder": "main",
  68. "last_opened_file_path": "C:/xampp/htdocs/java-wpd-auth/WPD-Auth-PR/WPD-Auth",
  69. "node.js.detected.package.eslint": "true",
  70. "node.js.detected.package.tslint": "true",
  71. "node.js.selected.package.eslint": "(autodetect)",
  72. "node.js.selected.package.tslint": "(autodetect)",
  73. "nodejs_package_manager_path": "npm",
  74. "settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices"
  75. >>>>>>> d3130ef8cd7f2e24330f0fdefbf64b99d1f1a249
  76. }
  77. }</component>
  78. <component name="RecentsManager">
  79. <key name="CreateClassDialog.RecentsKey">
  80. <recent name="org.waterproofingdata.wpdauth.service" />
  81. <recent name="org.waterproofingdata.wpdauth.controller" />
  82. </key>
  83. </component>
  84. <component name="RunManager">
  85. <configuration name="WpdauthApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
  86. <option name="MAIN_CLASS_NAME" value="org.waterproofingdata.wpdauth.WpdauthApplication" />
  87. <module name="wpdauth" />
  88. <extension name="coverage">
  89. <pattern>
  90. <option name="PATTERN" value="org.waterproofingdata.wpdauth.*" />
  91. <option name="ENABLED" value="true" />
  92. </pattern>
  93. </extension>
  94. <method v="2">
  95. <option name="Make" enabled="true" />
  96. </method>
  97. </configuration>
  98. <recent_temporary>
  99. <list>
  100. <item itemvalue="Application.WpdauthApplication" />
  101. </list>
  102. </recent_temporary>
  103. </component>
  104. <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  105. <component name="TaskManager">
  106. <task active="true" id="Default" summary="Default task">
  107. <changelist id="e096f643-4c6b-4769-84b8-63aa85cd1521" name="Changes" comment="" />
  108. <created>1685551011905</created>
  109. <option name="number" value="Default" />
  110. <option name="presentableId" value="Default" />
  111. <updated>1685551011905</updated>
  112. <workItem from="1685551016282" duration="3245000" />
  113. </task>
  114. <servers />
  115. </component>
  116. <component name="TypeScriptGeneratedFilesManager">
  117. <option name="version" value="3" />
  118. </component>
  119. <component name="Vcs.Log.Tabs.Properties">
  120. <option name="TAB_STATES">
  121. <map>
  122. <entry key="MAIN">
  123. <value>
  124. <State />
  125. </value>
  126. </entry>
  127. </map>
  128. </option>
  129. </component>
  130. </project>