new changes for login

2012-01-17 18:18:10 +05:30 · 2012-01-17 18:18:10 +05:30 · f4e26fc095
commit f4e26fc095
parent bedc1fe534 2e7273118f
2 changed files with 5 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -3,7 +3,11 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
+<<<<<<< HEAD
 	<script type="text/javascript">window._version_number="45"
+=======
+	<script type="text/javascript">window._version_number="48"
+>>>>>>> 2e7273118f62e613fc6c875284c6b179dd3a326d

 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]={}}
--- a/version.num
+++ b/version.num
@ -1 +1 @@
-45
+48