Merge pull request #234 from github/fix-merge-conflicts

gjtorikian · gjtorikian · commit 066b8a5f8455 · 2014-06-18T23:57:08.000-07:00
Fix merge conflicts
diff --git a/content/guides/managing-deploy-keys.md b/content/guides/managing-deploy-keys.md
@@ -19,6 +19,7 @@ This guide will help you decide what strategy is best for you.
 ## SSH agent forwarding
 
 In many cases, especially in the beginning of a project, SSH agent forwarding is the quickest and simplest method to use.  Agent forwarding uses the same SSH keys that your local development computer uses.
+
 #### Pros
 
 * You do not have to generate or keep track of any new keys.
