diff options
| author |  Tom Willemsen | 2012-09-25 22:20:43 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-09-25 22:20:43 +0200 |
| commit | 5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d (patch) | |
| tree | f534c84e67552c694dfa0cb5a6178446801612f2 /.conkerorrc/init.js | |
| parent | b2de3d6412ba51111ce9b51cc2a3b384735e040a (diff) | |
| parent | 73700816128c0788e822710dbad5e0bd3d8d54bf (diff) | |
| download | dotfiles-5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d.tar.gz dotfiles-5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/init.el
Diffstat (limited to '.conkerorrc/init.js')
| -rw-r--r-- | .conkerorrc/init.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js index 438f402..d8305af 100644 --- a/.conkerorrc/init.js +++ b/.conkerorrc/init.js @@ -122,7 +122,7 @@ define_webjump("ddg", $alternative="https://duckduckgo.com"); define_webjump("metal-archives", "http://www.metal-archives.com/search?searchString=%s&type=band_name", - $alternative="http://www.metal-arhives.com"); + $alternative="http://www.metal-archives.com"); define_webjump("djangodocs", "https://docs.djangoproject.com/search/?q=%s&release=5", $alternative="https://docs.djangoproject.com/"); |