X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fsshconfig;h=8b9d3fe7d04654d95255e8ff8978e6160637082a;hb=64cb05c445d480f29d266e70db6eb1d021d34456;hp=46b7b3858aca0e06f8167f14b343fc863c0e165e;hpb=403a570db9974377d99b2f2b02ce9c6c374f8008;p=clearscm.git

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