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

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