From 6345e424b09b6560c3aeabedd55138c5a5021051 Mon Sep 17 00:00:00 2001 From: quak Date: Sun, 8 Dec 2024 18:23:56 +0100 Subject: [PATCH] cleaned up merge conflict artifacts --- git.md | 1 - 1 file changed, 1 deletion(-) diff --git a/git.md b/git.md index 7102050..6b6053e 100644 --- a/git.md +++ b/git.md @@ -2,7 +2,6 @@ ## Table of contents -<<<<<<< HEAD - [glossary](#glossary) - [terminology](#terminology) - [branches](#branches)