SEG2105-Olympus-Android-App.../OlympusServices/.idea/vcs.xml

<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
  </component>
</project>
added appointment class and finished ui 2018-10-05 12:35:05 -04:00			`<?xml version="1.0" encoding="UTF-8"?>`
			`<project version="4">`
			`<component name="VcsDirectoryMappings">`
fixed merge conflict, when you pull check the right dependency is in your build.gradle file 2018-10-10 13:44:55 -04:00			`<mapping directory="" vcs="Git" />`
Changed UML 2018-10-17 17:53:33 -04:00			`<mapping directory="$PROJECT_DIR$/.." vcs="Git" />`
added appointment class and finished ui 2018-10-05 12:35:05 -04:00			`</component>`
			`</project>`