apcsa-projectstem-assignment8/.idea/vcs.xml

<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
</project>
vcs.xml added 2022-03-07 07:16:40 -06:00			`<?xml version="1.0" encoding="UTF-8"?>`
			`<project version="4">`
			`<component name="VcsDirectoryMappings">`
Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/vcs.xml 2022-03-07 07:16:57 -06:00			`<mapping directory="" vcs="Git" />`
vcs.xml added 2022-03-07 07:16:40 -06:00			`</component>`
			`</project>`