Fix bad merge

2021-02-04 17:50:56 -05:00
parent cacd0919c5
commit dcae1a4f1b
1 changed files with 0 additions and 7 deletions
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@ -74,15 +74,8 @@ Host penobscotbaypress.com
 # bhyve VMs
 Host mopidy.local
  User powellc
-<<<<<<< Updated upstream
 Host jellyfin.local
  User ubuntu
-||||||| constructed merge base
-=======
-# Jellyfin VM
-Host jellyfin.local
-  User ubuntu
->>>>>>> Stashed changes

 # Git uses it's own port
 Host git.local