new version
delete mysite folder

Conflicts:
	dong_qian_lake/dong_qian_lake/urls.py

dong_qian_lake/mysite/migrations/0007_auto__del_field_projectprogress_ph
oto__add_field_projectprogress_photo.py
	dong_qian_lake/mysite/models.py
	dong_qian_lake/mysite/static/bootstrap/css/bootstrap-responsive.css
	dong_qian_lake/mysite/static/bootstrap/css/bootstrap-responsive.min.css
	dong_qian_lake/mysite/static/bootstrap/css/bootstrap.css
	dong_qian_lake/mysite/static/bootstrap/css/bootstrap.min.css

dong_qian_lake/mysite/static/bootstrap/img/glyphicons-halflings-white.pn
g
	dong_qian_lake/mysite/static/bootstrap/img/glyphicons-halflings.png
	dong_qian_lake/mysite/static/bootstrap/js/bootstrap.js
	dong_qian_lake/mysite/static/bootstrap/js/bootstrap.min.js
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_1.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_1_1.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_2.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_2_1.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_3.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_3_1.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_4.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_4_1.jpg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_5.jpeg
	dong_qian_lake/mysite/static/dong-qian-lake-progress/image_5_1.jpeg
	dong_qian_lake/mysite/static/image_1.jpg
	dong_qian_lake/mysite/static/image_2.jpg
	dong_qian_lake/mysite/static/image_3.jpg
	dong_qian_lake/mysite/static/image_4.jpg
	dong_qian_lake/mysite/static/image_5.jpeg
	dong_qian_lake/mysite/views.py

dong_qian_lake/src/v2/migrations.old/0007_auto__del_field_projectprogres
s_photo__add_field_projectprogress_photo.py

dong_qian_lake/src/v2/migrations/0007_auto__del_field_projectprogress_ph
oto__add_field_projectprogress_photo.py
	dong_qian_lake/src/v2/models.py

dong_qian_lake/src/v2/models.py~5400b1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/css/bootstrap-responsive.css

dong_qian_lake/src/v2/static/bootstrap/css/bootstrap-responsive.css~5400
b1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/css/bootstrap-responsive.min.css

dong_qian_lake/src/v2/static/bootstrap/css/bootstrap-responsive.min.css~
5400b1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/css/bootstrap.css

dong_qian_lake/src/v2/static/bootstrap/css/bootstrap.css~5400b1aa6549329
f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/css/bootstrap.min.css

dong_qian_lake/src/v2/static/bootstrap/css/bootstrap.min.css~5400b1aa654
9329f63dc4ecc4ed09b331f2f7ba4

dong_qian_lake/src/v2/static/bootstrap/img/glyphicons-halflings-white.pn
g

dong_qian_lake/src/v2/static/bootstrap/img/glyphicons-halflings-white.pn
g~5400b1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/img/glyphicons-halflings.png

dong_qian_lake/src/v2/static/bootstrap/img/glyphicons-halflings.png~5400
b1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/js/bootstrap.js

dong_qian_lake/src/v2/static/bootstrap/js/bootstrap.js~5400b1aa6549329f6
3dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/bootstrap/js/bootstrap.min.js

dong_qian_lake/src/v2/static/bootstrap/js/bootstrap.min.js~5400b1aa65493
29f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_1.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_1.jpg~5400b1a
a6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_1.jpg~HEAD
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_1_1.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_1_1.jpg~5400b
1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_2.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_2.jpg~5400b1a
a6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_2.jpg~HEAD
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_2_1.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_2_1.jpg~5400b
1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_3.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_3.jpg~5400b1a
a6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_3.jpg~HEAD
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_3_1.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_3_1.jpg~5400b
1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_4.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_4.jpg~5400b1a
a6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_4.jpg~HEAD
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_4_1.jpg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_4_1.jpg~5400b
1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_5.jpeg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_5.jpeg~5400b1
aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_5.jpeg~HEAD
	dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_5_1.jpeg

dong_qian_lake/src/v2/static/dong-qian-lake-progress/image_5_1.jpeg~5400
b1aa6549329f63dc4ecc4ed09b331f2f7ba4
	dong_qian_lake/src/v2/static/image_1.jpg
	dong_qian_lake/src/v2/static/image_2.jpg
	dong_qian_lake/src/v2/static/image_3.jpg
	dong_qian_lake/src/v2/static/image_4.jpg
	dong_qian_lake/src/v2/static/image_5.jpeg
	dong_qian_lake/src/v2/views.py
	dong_qian_lake/src/v2/views.py~5400b1aa6549329f63dc4ecc4ed09b331f2f7ba4
change urls