Merge

2021-02-04 17:50:27 -05:00
parent 6c062038ce
commit cacd0919c5
7 changed files with 139 additions and 38 deletions
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@ -74,13 +74,20 @@ 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
  Port 222
-
+#
 ## Jail hosts all need a jump
 Host *.local 192.168.1.*
  User root