Nabin Hait 11f41955c9 [minor] fixed conflict while merging perpetual branch into master

2013-09-24 14:36:55 +05:30

..

demo_docs

…

__init__.py

…

demo_control_panel.py

…

demo-login.css

…

demo-login.html

…

demo-login.js

…

make_demo.py

…

make_erpnext_demo.py

…