diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-11-29 12:23:50 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-11-29 12:23:50 +0100 |
| commit | a2b23a1ca71a25f912c5f92e8a1dbfdde69bc568 (patch) | |
| tree | a7d25dab181b17f76f7d9616a73b3f905f5c69da /addons/web/static/test | |
| parent | c4a845b50e2ca2c6750a512e1980282e4d6d57a3 (diff) | |
[REM] merge conflict file committed
bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6
Diffstat (limited to 'addons/web/static/test')
| -rw-r--r-- | addons/web/static/test/test.html.THIS | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/addons/web/static/test/test.html.THIS b/addons/web/static/test/test.html.THIS deleted file mode 100644 index f5f29f88d7c..00000000000 --- a/addons/web/static/test/test.html.THIS +++ /dev/null @@ -1,63 +0,0 @@ -<!DOCTYPE html> -<html style="height: 100%"> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>OpenERP Web Test Suite</title> - <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> - - <link rel="stylesheet" href="/web/static/lib/qunit/qunit.css"> - <script src="/web/static/lib/qunit/qunit.js" type="text/javascript"></script> - - <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script> - <script src="/web/static/lib/underscore/underscore.string.js" type="text/javascript"></script> - <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script> - - <!-- jquery --> - <script src="/web/static/lib/jquery/jquery-1.7.2.js"></script> - <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.8.17.custom.min.js"></script> - <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js"></script> - - <script src="/web/static/lib/datejs/globalization/en-US.js"></script> - <script src="/web/static/lib/datejs/core.js"></script> - <script src="/web/static/lib/datejs/parser.js"></script> - <script src="/web/static/lib/datejs/sugarpak.js"></script> - <script src="/web/static/lib/datejs/extras.js"></script> - - <script src="/web/static/lib/qweb/qweb2.js"></script> - - <script src="/web/static/lib/py.js/lib/py.js"></script> - - <script src="/web/static/src/js/boot.js"></script> - <script src="/web/static/src/js/pyeval.js"></script> - <script src="/web/static/src/js/corelib.js"></script> - <script src="/web/static/src/js/coresetup.js"></script> - <script src="/web/static/src/js/dates.js"></script> - <script src="/web/static/src/js/formats.js"></script> - <script src="/web/static/src/js/chrome.js"></script> - <script src="/web/static/src/js/data.js"></script> - <script src="/web/static/src/js/views.js"></script> - <script src="/web/static/src/js/search.js"></script> - <script src="/web/static/src/js/view_form.js"></script> - <script src="/web/static/src/js/view_list.js"></script> - <script src="/web/static/src/js/view_list_editable.js"></script> - - <script src="/web/static/test/testing.js"></script> - <script type="text/javascript"> - QUnit.config.testTimeout = 2000; - </script> -</head> - <body id="oe" class="openerp"> - <div id="qunit"></div> - <div id="qunit-fixture"></div> - </body> - <script type="text/javascript" src="/web/static/test/class.js"></script> - <script type="text/javascript" src="/web/static/test/registry.js"></script> - <script type="text/javascript" src="/web/static/test/form.js"></script> - <script type="text/javascript" src="/web/static/test/list-utils.js"></script> - <script type="text/javascript" src="/web/static/test/formats.js"></script> - <script type="text/javascript" src="/web/static/test/rpc.js"></script> - <script type="text/javascript" src="/web/static/test/evals.js"></script> - <script type="text/javascript" src="/web/static/test/search.js"></script> - <script type="text/javascript" src="/web/static/test/Widget.js"></script> - <script type="text/javascript" src="/web/static/test/list-editable.js"></script> -</html> |