1 files changed, 8 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": {},