summaryrefslogtreecommitdiff
path: root/.ssh/config
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-10-12 19:12:40 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-10-12 19:12:40 -0400
commit8ff950d098146bc929504b062bcc6ccd5a2cb6ed (patch)
treee5d73cf1997b28bbaa24a693f5d8c2abb45be313 /.ssh/config
parent9d689e7d224b5c1ea3ab3018998135979f19c5a9 (diff)
parentb0cdbb3da2c2b36d3c65b00db4eaf5a0d29c2cd6 (diff)
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts: .config/bash/rc.sh .config/login.sh .config/ssh/config .config/wmii/include.sh
Diffstat (limited to '.ssh/config')
-rw-r--r--.ssh/config14
1 files changed, 0 insertions, 14 deletions
diff --git a/.ssh/config b/.ssh/config
deleted file mode 100644
index 7520099..0000000
--- a/.ssh/config
+++ /dev/null
@@ -1,14 +0,0 @@
-Host *
- Protocol 2
- ControlMaster auto
- ControlPath ~/.ssh/master-%r@%h:%p
- Compression yes
-
-# Parabola Repo Server
-Host repo
- Port 1863
- HostName repo.parabolagnulinux.org
-
-Host lore
- HostName lore.cs.purdue.edu
- User shumakl