diff options
| author | Stephen Blott | 2014-12-14 14:17:54 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-12-14 14:20:54 +0000 |
| commit | 9b8817593af71ddc106c60d44bc967a4bcc553e9 (patch) | |
| tree | e8030195a85189c23dedc3aacb06e3bdc8351460 /test_harnesses/vomnibar.html | |
| parent | 3f3444d1fe72c74439bd9bec3c27ab441ae560a0 (diff) | |
| parent | d42913f75443df565d33ef5c565cd80c31714a60 (diff) | |
| download | vimium-9b8817593af71ddc106c60d44bc967a4bcc553e9.tar.bz2 | |
Merge branch 'vomnibarToPage' of https://github.com/smblott-github/vimium into smblott-github-vomnibarToPage
Conflicts:
background_scripts/main.coffee
content_scripts/vimium.css
content_scripts/vomnibar.coffee
lib/utils.coffee
Diffstat (limited to 'test_harnesses/vomnibar.html')
| -rw-r--r-- | test_harnesses/vomnibar.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test_harnesses/vomnibar.html b/test_harnesses/vomnibar.html index 4d50e749..820210b0 100644 --- a/test_harnesses/vomnibar.html +++ b/test_harnesses/vomnibar.html @@ -11,7 +11,7 @@ <script type="text/javascript" src="../lib/keyboard_utils.js"></script> <script type="text/javascript" src="../lib/dom_utils.js"></script> <script src="https://github.com/ooyala/livecss/raw/master/livecss.js"></script> - <script type="text/javascript" src="../content_scripts/vomnibar.js"></script> + <script type="text/javascript" src="../pages/vomnibar.js"></script> <link rel="stylesheet" type="text/css" href="../vimium.css" /> <script> function setup() { |