From 7f7f28514dde82d6d235063671197dc982b105e7 Mon Sep 17 00:00:00 2001 From: Leilukin Date: Sun, 20 Apr 2025 06:27:24 +0800 Subject: [PATCH] Remove Git conflicts --- src/slashes/footerlinks/uses.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/slashes/footerlinks/uses.md b/src/slashes/footerlinks/uses.md index 2b7cf610..e8575d51 100644 --- a/src/slashes/footerlinks/uses.md +++ b/src/slashes/footerlinks/uses.md @@ -87,11 +87,7 @@ You can find more /uses pages on [uses.tech](https://uses.tech/). - Code editors: [Vim](https://www.vim.org/) and [Notepad++](https://notepad-plus-plus.org/) - Terminal emulator: [Windows Terminal](https://en.wikipedia.org/wiki/Windows_Terminal) - Shell: [PowerShell](https://microsoft.com/powershell) on Windows and [Zsh](https://www.zsh.org/) on Linux -<<<<<<< HEAD - Version control: [Git](https://git-scm.com/) with [GitHub](https://github.com/) and [32-Bit Cafe's Gitea instance](https://git.32bit.cafe/) -======= -- Version control: [Git](https://git-scm.com/) with [GitHub](https://github.com/) ->>>>>>> 3e1fc8babc1f267dee54a9c7858ec6fe5cba1f2d ### Media