Merge branch 'zimujun_branch' of https://bdgit.educoder.net/ptinqsey9/for_you into zimujun_branch

# Conflicts:
#	src/webserver/routers/router.go
remotes/1718373473996375672/master
zimujun20 2 years ago
commit a4e09903ea

8
.idea/.gitignore vendored

@ -0,0 +1,8 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

@ -0,0 +1 @@
main.go

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/for_you.iml" filepath="$PROJECT_DIR$/.idea/for_you.iml" />
</modules>
</component>
</project>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
Loading…
Cancel
Save