CyclingApp/Backend/.idea/workspace.xml

<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="1b2fc6ac-3191-4a3c-89bc-d9c070a44074" name="Default" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/.editorconfig" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/.gitignore" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/config.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/ionic.config.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/package-lock.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/package.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/README.md" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-hdpi-icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-ldpi-icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-mdpi-icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-xhdpi-icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-xxhdpi-icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/icon/drawable-xxxhdpi-icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-hdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-ldpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-mdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-xhdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-xxhdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-land-xxxhdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-hdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-ldpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-mdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-xhdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-xxhdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/android/splash/drawable-port-xxxhdpi-screen.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-1024.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-40.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-40@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-40@3x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-50.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-50@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-60.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-60@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-60@3x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-72.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-72@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-76.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-76@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-83.5@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-small.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-small@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon-small@3x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/icon/icon@2x.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-568h@2x~iphone.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-667h.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-736h.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape-736h.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape@2x~ipad.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape@~ipadpro.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Landscape~ipad.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Portrait@2x~ipad.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Portrait@~ipadpro.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default-Portrait~ipad.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default@2x~iphone.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default@2x~universal~anyany.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/ios/splash/Default~iphone.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/resources/splash.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.component.ts" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.html" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.module.ts" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/app.scss" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/app/main.ts" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/assets/icon/favicon.ico" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/assets/imgs/logo.png" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/index.html" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/manifest.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/pages/home/home.html" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/pages/home/home.scss" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/pages/home/home.ts" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/service-worker.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/src/theme/variables.scss" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/tsconfig.json" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../cyclingFrontEnd/tslint.json" beforeDir="false" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
    <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="FileEditorManager">
<<<<<<< HEAD
    <leaf>
      <file leaf-file-name="BikeProjectApplication.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="165">
              <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
=======
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file leaf-file-name="BikeProjectApplication.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="90">
              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="705">
              <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="60">
              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/pom.xml">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="-112" />
          </provider>
        </entry>
      </file>
      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="58">
              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="30">
              <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
>>>>>>> whatBranch
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
  </component>
<<<<<<< HEAD
=======
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java" />
      </list>
    </option>
  </component>
>>>>>>> whatBranch
  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsGulpfileManager">
    <detection-done>true</detection-done>
    <sorting>DEFINITION_ORDER</sorting>
  </component>
  <component name="NodePackageJsonFileManager">
    <packageJsonPaths />
  </component>
  <component name="ProjectFrameBounds" fullScreen="true">
    <option name="x" value="-246" />
    <option name="y" value="-1080" />
    <option name="width" value="1920" />
    <option name="height" value="1080" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="PackagesPane" />
      <pane id="AndroidView" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
<<<<<<< HEAD
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
=======
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
>>>>>>> whatBranch
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
<<<<<<< HEAD
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
=======
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
>>>>>>> whatBranch
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
<<<<<<< HEAD
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
=======
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
>>>>>>> whatBranch
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
<<<<<<< HEAD
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
=======
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
>>>>>>> whatBranch
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
<<<<<<< HEAD
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
=======
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
>>>>>>> whatBranch
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
<<<<<<< HEAD
              <item name="Backend" type="462c0819:PsiDirectoryNode" />
=======
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
>>>>>>> whatBranch
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
            </path>
<<<<<<< HEAD
=======
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
              <item name="Controller" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
              <item name="Entity" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="passionProject" type="462c0819:PsiDirectoryNode" />
              <item name="bikeProject" type="462c0819:PsiDirectoryNode" />
              <item name="Repository" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="bikeProject" type="b2602c69:ProjectViewProjectNode" />
              <item name="backEnd" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
            </path>
>>>>>>> whatBranch
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
    <property name="project.structure.last.edited" value="Global Libraries" />
    <property name="project.structure.proportion" value="0.0" />
    <property name="project.structure.side.proportion" value="0.2" />
    <property name="settings.editor.selected.configurable" value="configurable.group.build" />
  </component>
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
  <component name="RunManager">
    <configuration default="true" type="Application" factoryName="Application">
      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
    </configuration>
    <configuration default="true" type="JUnit" factoryName="JUnit">
      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
      <option name="ALTERNATIVE_JRE_PATH" />
      <option name="PACKAGE_NAME" />
      <option name="MAIN_CLASS_NAME" />
      <option name="METHOD_NAME" />
      <option name="TEST_OBJECT" value="class" />
      <option name="VM_PARAMETERS" value="-ea" />
      <option name="PARAMETERS" />
      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
      <option name="PASS_PARENT_ENVS" value="true" />
      <option name="TEST_SEARCH_SCOPE">
        <value defaultName="singleModule" />
      </option>
      <patterns />
    </configuration>
    <configuration name="BikeProjectApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
      <module name="bikeProject" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.passionProject.bikeProject.BikeProjectApplication" />
    </configuration>
    <configuration default="true" type="TestNG" factoryName="TestNG">
      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
      <option name="ALTERNATIVE_JRE_PATH" />
      <option name="SUITE_NAME" />
      <option name="PACKAGE_NAME" />
      <option name="MAIN_CLASS_NAME" />
      <option name="METHOD_NAME" />
      <option name="GROUP_NAME" />
      <option name="TEST_OBJECT" value="CLASS" />
      <option name="VM_PARAMETERS" value="-ea" />
      <option name="PARAMETERS" />
      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
      <option name="OUTPUT_DIRECTORY" />
      <option name="PASS_PARENT_ENVS" value="true" />
      <option name="TEST_SEARCH_SCOPE">
        <value defaultName="singleModule" />
      </option>
      <option name="USE_DEFAULT_REPORTERS" value="false" />
      <option name="PROPERTIES_FILE" />
      <properties />
      <listeners />
    </configuration>
  </component>
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
      <changelist id="1b2fc6ac-3191-4a3c-89bc-d9c070a44074" name="Default" comment="" />
      <created>1531948550601</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1531948550601</updated>
<<<<<<< HEAD
      <workItem from="1531948552317" duration="211000" />
=======
      <workItem from="1531948552317" duration="43000" />
      <workItem from="1532100900888" duration="513000" />
>>>>>>> whatBranch
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
<<<<<<< HEAD
    <option name="totallyTimeSpent" value="211000" />
=======
    <option name="totallyTimeSpent" value="557000" />
>>>>>>> whatBranch
  </component>
  <component name="ToolWindowManager">
    <frame x="-246" y="-1080" width="1920" height="1080" extended-state="0" />
    <editor active="true" />
    <layout>
      <window_info anchor="right" id="Palette" order="3" />
      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
      <window_info anchor="right" id="Maven Projects" order="3" />
      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
      <window_info id="Capture Tool" order="2" />
      <window_info id="Designer" order="2" />
      <window_info anchor="right" id="Database" order="3" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info id="UI Designer" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
<<<<<<< HEAD
      <window_info anchor="right" id="Palette&#9;" />
      <window_info id="Image Layers" />
      <window_info anchor="bottom" id="Java Enterprise" />
      <window_info anchor="right" id="Capture Analysis" />
      <window_info anchor="bottom" id="Run" order="2" />
      <window_info anchor="bottom" id="Version Control" />
      <window_info anchor="bottom" id="Spring" />
      <window_info anchor="bottom" id="Terminal" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
      <window_info anchor="right" id="Bean Validation" />
      <window_info id="Web" side_tool="true" />
      <window_info anchor="right" id="Theme Preview" />
      <window_info id="Favorites" side_tool="true" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
=======
      <window_info anchor="bottom" id="Messages" order="8" />
      <window_info anchor="right" id="Palette&#9;" order="3" />
      <window_info id="Image Layers" order="2" />
      <window_info anchor="bottom" id="Java Enterprise" order="7" />
      <window_info anchor="right" id="Capture Analysis" order="3" />
      <window_info anchor="bottom" id="Version Control" order="7" />
      <window_info anchor="bottom" id="Run" order="2" weight="0.600995" />
      <window_info anchor="bottom" id="Spring" order="7" />
      <window_info anchor="bottom" id="Terminal" order="7" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19116081" />
      <window_info anchor="right" id="Bean Validation" order="3" />
      <window_info id="Web" order="2" side_tool="true" />
      <window_info anchor="right" id="Theme Preview" order="3" />
      <window_info id="Favorites" order="2" side_tool="true" />
>>>>>>> whatBranch
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
      <window_info anchor="bottom" id="Find" order="1" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
      <provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
        <state relative-caret-position="165">
=======
        <state relative-caret-position="75">
          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="90">
          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="210">
>>>>>>> whatBranch
          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
        </state>
      </provider>
    </entry>
<<<<<<< HEAD
=======
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Entity/User.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="58">
          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Repository/UserRepository.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="30">
          <caret line="2" column="7" lean-forward="true" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/BikeProjectApplication.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="90">
          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/passionProject/bikeProject/Controller/UserController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="705">
          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-112" />
      </provider>
    </entry>
>>>>>>> whatBranch
  </component>
  <component name="masterDetails">
    <states>
      <state key="ArtifactsStructureConfigurable.UI">
        <settings>
          <artifact-editor />
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="FacetStructureConfigurable.UI">
        <settings>
          <last-edited>Spring</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="GlobalLibrariesConfigurable.UI">
        <settings>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="JdkListConfigurable.UI">
        <settings>
          <last-edited>1.8</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ModuleStructureConfigurable.UI">
        <settings>
<<<<<<< HEAD
          <last-edited>Web|bikeProject</last-edited>
=======
          <last-edited>bikeProject</last-edited>
>>>>>>> whatBranch
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
<<<<<<< HEAD
=======
                <option value="0.6" />
>>>>>>> whatBranch
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
      <state key="ProjectLibrariesConfigurable.UI">
        <settings>
          <last-edited>Maven: antlr:antlr:2.7.7</last-edited>
          <splitter-proportions>
            <option name="proportions">
              <list>
                <option value="0.2" />
              </list>
            </option>
          </splitter-proportions>
        </settings>
      </state>
    </states>
  </component>
</project>