Fixed conflict while merging with develop brnach
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index d902fe1..73099d1 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -24,14 +24,16 @@
wn.provide('wn.ui.misc');
wn.ui.misc.about = function() {
if(!wn.ui.misc.about_dialog) {
- var d = new wn.ui.Dialog({title: wn._('About ERPNext')})
+ var d = new wn.ui.Dialog({title: wn._('About')})
$(d.body).html(repl("<div>\
- <p>"+wn._("ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd. to provide an integrated tool to manage most processes in a small organization. For more information about Web Notes, or to buy hosting servies, go to ")+
- "<a href='https://erpnext.com'>https://erpnext.com</a>.</p>\
- <p>"+wn._("To report an issue, go to ")+"<a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p>\
- <hr>\
+ <h2>ERPNext</h2> \
+ <p>"+wn._("An open source ERP made for the web.</p>") +
+ "<p>"+wn._("To report an issue, go to ")+"<a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p> \
+ <p><a href='http://erpnext.org' target='_blank'>http://erpnext.org</a>.</p>\
<p><a href='http://www.gnu.org/copyleft/gpl.html'>License: GNU General Public License Version 3</a></p>\
+ <hr>\
+ <p>© 2014 Web Notes Technologies Pvt. Ltd and contributers </p> \
</div>", wn.app));
wn.ui.misc.about_dialog = d;