From b792ed623d4bd9f64d0ee69937a7930863a0df39 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Fri, 20 Aug 2021 21:11:37 -0400
Subject: Merge branch 'master' of ssh://git.pehjota.net/dotfiles/midori

Conflicts:
	.config/midori/config
---
(limited to '.config/midori/config')

--
cgit v0.9.1