Merge branch 'master' of defaria.com:/opt/git/clearscm

[clearscm.git] / rc / sshconfig

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