Leilukin/leilukin-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Git conflicts

Browse Source
This commit is contained in:
Leilukin 2025-04-20 06:27:24 +08:00 committed by Helen Chong
parent 22f3dbc1d8
commit 7f7f28514d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slashes/footerlinks/uses.md
View File

@ -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/) - 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) - 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 - 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/) 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 ### Media