From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Fri, 4 Nov 2016 01:05:58 +0000 (-0700)
Subject: Fixed error in sshconfig
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=227589ff14cd887275f627e922eb4aec61fc2fe4;p=clearscm.git

Fixed error in sshconfig
---

diff --git a/rc/sshconfig b/rc/sshconfig
index 8b9d3fe..46b7b38 100644
--- a/rc/sshconfig
+++ b/rc/sshconfig
@@ -39,4 +39,3 @@ Host git-rtp
   
 Host jira-dev
   Hostname jira-rtp-06.rtp.broadcom.com
->>>>>>> 9956e403ab89bc984faf9cb22a8860a34c310ac7