fixed conflicts

2012-01-18 10:54:55 +05:30 · 2012-01-18 10:54:55 +05:30 · 0a29975bfe
commit 0a29975bfe
parent 16a7807005 d6269be0b1
4 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,4 +6,5 @@ user_files
 patch.log
 lib
 versions-local.db
+user_files
 *.sql*
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@ -8,7 +8,7 @@ def on_login(login_manager):
 	"""
 	try:
 		import server_tools.gateway_utils
-		server_tools.gateway_utils.check_login()
+		server_tools.gateway_utils.check_login(login_manager.user)
 	except ImportError:
 		pass

--- 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="48"
+	<script type="text/javascript">window._version_number="49"
 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]={}}
 parent=parent[n];}}
--- a/version.num
+++ b/version.num
@ -1 +1 @@
-48
+49