secstate/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Colin Powell
2021-02-04 17:50:56 -05:00
parent cacd0919c5
commit dcae1a4f1b
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ssh/.ssh/config
View File

@ -74,15 +74,8 @@ Host penobscotbaypress.com
# bhyve VMs # bhyve VMs
Host mopidy.local Host mopidy.local
User powellc User powellc
<<<<<<< Updated upstream
Host jellyfin.local Host jellyfin.local
User ubuntu User ubuntu
||||||| constructed merge base
=======
# Jellyfin VM
Host jellyfin.local
User ubuntu
>>>>>>> Stashed changes
# Git uses it's own port # Git uses it's own port
Host git.local Host git.local