commit 16a7807005fd9a562bbef83a6b637638ad75a26d
author Rushabh Mehta <rmehta@gmail.com> Tue Jan 17 18:29:52 2012 +0530
committer Rushabh Mehta <rmehta@gmail.com> Tue Jan 17 18:29:52 2012 +0530
tree 4fa073b84bd15816e8eb9a62627acdd83f05a876
parent f4e26fc0959bade529562923e4ef42ff52cd1b90

confict fix

index.html

diff --git a/index.html b/index.html
index b9cdbc8..7cb60c2 100644
--- a/index.html
+++ b/index.html
@@ -3,12 +3,7 @@
 	<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]={}}
 parent=parent[n];}}