Commit 5f08568d201f6c20dc4b36920ba878748dbf89fc
Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
Showing
2 changed files
with
5 additions
and
7 deletions
.gitignore
.idea/modules.xml
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | - <component name="ProjectModuleManager"> | ||
| 4 | - <modules> | ||
| 5 | - <module fileurl="file://$PROJECT_DIR$/.idea/workreport.iml" filepath="$PROJECT_DIR$/.idea/workreport.iml" /> | ||
| 6 | - </modules> | ||
| 7 | - </component> | 3 | + <component name="ProjectModuleManager"> |
| 4 | + <modules> | ||
| 5 | + <module fileurl="file://$PROJECT_DIR$/workreport.iml" filepath="$PROJECT_DIR$/workreport.iml" /> | ||
| 6 | + </modules> | ||
| 7 | + </component> | ||
| 8 | </project> | 8 | </project> |
| 9 | \ No newline at end of file | 9 | \ No newline at end of file |