From f1075f2c7d19cccf36f0e848ce135a220add1512 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@nicksweeting.com>
Date: Sat, 30 Mar 2019 23:43:53 -0400
Subject: [PATCH] fix links index

---
 archivebox/templates/link_index.html | 2 +-
 archivebox/util.py                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archivebox/templates/link_index.html b/archivebox/templates/link_index.html
index 509d2a76..efe8a7e8 100644
--- a/archivebox/templates/link_index.html
+++ b/archivebox/templates/link_index.html
@@ -245,7 +245,7 @@
                             ArchiveBox
                         </a>
                     </div>
-                    <div class="col-lg-10">
+                    <div class="col-lg-8">
                         <img src="$link_dir/$favicon_url" alt="Favicon">
                         &nbsp;&nbsp;
                         $title
diff --git a/archivebox/util.py b/archivebox/util.py
index 43b5c7c0..ec8c256b 100644
--- a/archivebox/util.py
+++ b/archivebox/util.py
@@ -450,7 +450,7 @@ def merge_links(a: Link, b: Link) -> Link:
 
     sources = list(set(a.sources + b.sources))
 
-    all_methods = (set(a.history.keys()) | set(a.history.keys()))
+    all_methods = set(list(a.history.keys()) + list(a.history.keys()))
     history = {
         method: (a.history.get(method) or []) + (b.history.get(method) or [])
         for method in all_methods