[merge] fixed conflict

This commit is contained in:
Nabin Hait
2013-07-07 11:38:10 +05:30
3 changed files with 7 additions and 4 deletions

View File

View File

@@ -0,0 +1,3 @@
def execute():
from startup.install import import_defaults
import_defaults()

View File

@@ -170,6 +170,6 @@ def import_defaults():
] ]
for r in records: for r in records:
bean = webnotes.bean(r) if not webnotes.conn.exists(r['doctype'], r['name']):
bean.insert() bean = webnotes.bean(r)
bean.insert()