2 files changed, 36 insertions, 0 deletions
diff --git a/dotfiles/system/.config/calibre/customize.py.json b/dotfiles/system/.config/calibre/customize.py.json
index a648e4b..d092cb3 100644
--- a/dotfiles/system/.config/calibre/customize.py.json
+++ b/dotfiles/system/.config/calibre/customize.py.json
@@ -6,11 +6,19 @@
   "enabled_plugins": {
     "__class__": "set",
     "__value__": [
+<<<<<<< Updated upstream
       "Big Book Search",
       "KoboTouch",
       "KoboTouchExtended",
       "Kobo Reader Device Interface",
       "Google Images"
+=======
+      "Kobo Reader Device Interface",
+      "KoboTouchExtended",
+      "Big Book Search",
+      "Google Images",
+      "KoboTouch"
+>>>>>>> Stashed changes
     ]
   },
   "filetype_mapping": {},
diff --git a/dotfiles/system/.config/calibre/gui.py.json b/dotfiles/system/.config/calibre/gui.py.json
index a6caea0..95bdc07 100644
--- a/dotfiles/system/.config/calibre/gui.py.json
+++ b/dotfiles/system/.config/calibre/gui.py.json
@@ -46,6 +46,7 @@
   "jobs_search_history": [],
   "lrf_viewer_search_history": [],
   "main_search_history": [
+<<<<<<< Updated upstream
     "author:Heidegger",
     "author:Heidegger not format:epub",
     "author:Heidegger not format:pdf",
@@ -53,6 +54,33 @@
     "author:Heidegger ! format:epub",
     "author:Heidegger !format:epub",
     "lee braver"
+=======
+    "rebel camus",
+    "author:heidegger",
+    "phenomenology of intuition author:heidegger",
+    "author:hitchens format:epub",
+    "author:hitchens",
+    "jefferson author:hitchens",
+    "author:koestler",
+    "author:orwell",
+    "hitchens orwell",
+    "CARR Yearbook",
+    "tag:inbox",
+    "inbox",
+    "author:machiavelli",
+    "machiavelli",
+    "authors:\"=Anne Applebaum\"",
+    "heidegger",
+    "format:epub",
+    "orwell hitchens",
+    "orwell",
+    "read",
+    "study",
+    "author:john rawls",
+    "liberty mill",
+    "puzzles",
+    "author:John Stuart Mill"
+>>>>>>> Stashed changes
   ],
   "main_window_geometry": null,
   "match_tags_type": "any",