Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Rushabh Mehta 2012-01-18 10:54:55 +05:30
commit 0a29975bfe
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,4 +6,5 @@ user_files
patch.log patch.log
lib lib
versions-local.db versions-local.db
user_files
*.sql* *.sql*

2
erpnext/startup/event_handlers.py
View File

@ -8,7 +8,7 @@ def on_login(login_manager):
""" """
try: try:
import server_tools.gateway_utils import server_tools.gateway_utils
server_tools.gateway_utils.check_login() server_tools.gateway_utils.check_login(login_manager.user)
except ImportError: except ImportError:
pass pass

2
index.html
View File

@ -3,7 +3,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>ERPNext</title> <title>ERPNext</title>
<meta name="author" content=""> <meta name="author" content="">
<script type="text/javascript">window._version_number="48" <script type="text/javascript">window._version_number="49"
wn={} 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]={}} 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];}} parent=parent[n];}}

2
version.num
View File

@ -1 +1 @@
48 49