From 227589ff14cd887275f627e922eb4aec61fc2fe4 Mon Sep 17 00:00:00 2001
From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Thu, 3 Nov 2016 18:05:58 -0700
Subject: [PATCH] Fixed error in sshconfig

---
 rc/sshconfig | 1 -
 1 file changed, 1 deletion(-)

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
-- 
2.17.1