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

confict fix

Browse Source
This commit is contained in:
Rushabh Mehta 2012-01-17 18:29:52 +05:30
parent f4e26fc095
commit 16a7807005
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
index.html
View File

@ -3,12 +3,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>ERPNext</title> <title>ERPNext</title>
<meta name="author" content=""> <meta name="author" content="">
<<<<<<< HEAD
<script type="text/javascript">window._version_number="45"
=======
<script type="text/javascript">window._version_number="48" <script type="text/javascript">window._version_number="48"
>>>>>>> 2e7273118f62e613fc6c875284c6b179dd3a326d
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];}}