Commit 80a1be714dbf5c19204c7ef9c693de61e4d65592
Merge branch 'branch' of http://gitlab1.renniting.cn/web_developers/jy_parkingOS into branch
Showing
1 changed file
with
3 additions
and
0 deletions
.gitignore
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | .project | 2 | .project |
3 | jy_parkingOS.iml | 3 | jy_parkingOS.iml |
4 | .idea/misc.xml | 4 | .idea/misc.xml |
5 | +.idea/modules.xml | ||
5 | 6 | ||
6 | # Windows | 7 | # Windows |
7 | [Dd]esktop.ini | 8 | [Dd]esktop.ini |
@@ -21,4 +22,6 @@ $RECYCLE.BIN/ | @@ -21,4 +22,6 @@ $RECYCLE.BIN/ | ||
21 | # Node.js | 22 | # Node.js |
22 | node_modules/ | 23 | node_modules/ |
23 | 24 | ||
25 | +unpackage/ | ||
26 | + | ||
24 | 27 |