fixed conflicts
diff --git a/.gitignore b/.gitignore
index 0ef6ee5..a99a7b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
patch.log
lib
versions-local.db
+user_files
*.sql*
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index 88d7a33..1611acb 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -8,7 +8,7 @@
"""
try:
import server_tools.gateway_utils
- server_tools.gateway_utils.check_login()
+ server_tools.gateway_utils.check_login(login_manager.user)
except ImportError:
pass
diff --git a/index.html b/index.html
index 7cb60c2..ebe217b 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="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];}}
diff --git a/version.num b/version.num
index 21e72e8..2e66562 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-48
+49
\ No newline at end of file