diff options
| author | Stephen Blott | 2015-05-29 06:43:19 +0100 |
|---|---|---|
| committer | Stephen Blott | 2015-05-29 06:43:19 +0100 |
| commit | 42fa6e9506d95073e0ca6924b1b9a082d23bd483 (patch) | |
| tree | eb9e526f6f57ab4e49ff9e0579d26a9c648df521 /background_scripts/settings.coffee | |
| parent | 67e012f2c9de903deeaa5ade730161665a0bf430 (diff) | |
| parent | 45157bc460494503ca2b90caa762e72d224a1ef3 (diff) | |
| download | vimium-42fa6e9506d95073e0ca6924b1b9a082d23bd483.tar.bz2 | |
Merge branch 'completion-on-custom-search-only' into completion-on-custom-search-only-merge
Conflicts:
background_scripts/completion.coffee
Diffstat (limited to 'background_scripts/settings.coffee')
| -rw-r--r-- | background_scripts/settings.coffee | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index 269b4a2c..d23649ee 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -43,7 +43,6 @@ root.Settings = Settings = # or strings defaults: scrollStepSize: 60 - omniSearchWeight: 0.4 smoothScroll: true keyMappings: "# Insert your preferred key mappings here." linkHintCharacters: "sadfjklewcmpgh" |