From 9cf92df638afb12361b88eda00741cac3f958012 Mon Sep 17 00:00:00 2001 From: exu Date: Thu, 4 Apr 2024 11:11:37 +0200 Subject: [PATCH] Add "git - ours & theirs" link --- pages/04.other/useful-links/default.en.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pages/04.other/useful-links/default.en.md b/pages/04.other/useful-links/default.en.md index 863183f..778145d 100644 --- a/pages/04.other/useful-links/default.en.md +++ b/pages/04.other/useful-links/default.en.md @@ -12,3 +12,7 @@ Cloudflare provide a more detailed than normal speed test website. ![Cloudflare internet speed test page](speedtest-cloudflare.png) > [Internet Speed Test](https://speed.cloudflare.com/) + +## git - ours & theirs + +[git - ours & theirs by Nitay Megides](https://nitaym.github.io/ourstheirs/)