解决冲突

liurunyu

2024-07-25 7af935e6a092193adf309f3a2d700f049b4b63d8

1
2
3
4
5
6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
  </component>
</project>