resolved conflict
diff --git a/erpnext/patches/packing_slip.py b/erpnext/patches/packing_slip.py
index b6c94c0..9285e8a 100644
--- a/erpnext/patches/packing_slip.py
+++ b/erpnext/patches/packing_slip.py
@@ -1,4 +1,5 @@
def execute():
+ import webnotes
from webnotes.modules.module_manager import reload_doc
reload_doc('stock', 'doctype', 'delivery_note_detail')
reload_doc('stock', 'Print Format', 'Delivery Note Packing List Wise')
diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css
index f028416..7b2b6e5 100644
--- a/erpnext/startup/startup.css
+++ b/erpnext/startup/startup.css
@@ -4,7 +4,7 @@
}
body, span, div, td, input, textarea, button, select {
- font-family: Verdana, Arial, Sans Serif;
+ font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, sans-serif;
font-size: 12px;
}
diff --git a/index.html b/index.html
index cedc9dc..f4f087b 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
- <script type="text/javascript">window._version_number="65"
+ <script type="text/javascript">window._version_number="66"
wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
diff --git a/versions-master.db b/versions-master.db
index 3ffd092..6628a89 100644
--- a/versions-master.db
+++ b/versions-master.db
Binary files differ