Commit b0c229df authored by lingqingmei's avatar lingqingmei

giti

parent c458140e
<<<<<<< HEAD
dea
=======
/nbproject/ /nbproject/
.idea .idea
>>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9
*.DS_Store *.DS_Store
upload upload
/data/log /data/log
/data/images /data/images
/scripts/crontab/push/nohup.out /scripts/crontab/push/nohup.out
/lib /lib
<<<<<<< HEAD
=======
>>>>>>> 07613dd26e99bb68b3772e7616f45675937eabb9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment