From e206c937377ff290c3587c766f84214971d5fe6f Mon Sep 17 00:00:00 2001
From: ktyl <me@ktyl.dev>
Date: Sat, 14 May 2022 11:33:15 +0100
Subject: [PATCH] ours vs theirs

---
 content/reference.gmi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/reference.gmi b/content/reference.gmi
index b874788..9eab74e 100644
--- a/content/reference.gmi
+++ b/content/reference.gmi
@@ -17,6 +17,7 @@ for my own reference really but do enjoy :)
 
 => https://write.jokke.space/linux-dreams-and-nightmares/mpd-with-a-remote-music-library    MPD with a remote music library [www]
 => https://vim.fandom.com/wiki/Entering_special_characters                                  Entering special characters in Vim [www]
+=> https://nitaym.github.io/ourstheirs/                                                     'Ours' vs. 'theirs' when resolving conflicts in Git [www]
 
 ## interesting