Changes in eab131f: mail change 1

				faq-setting-up-key-based-ssh.md
			
          @@ -25,7 +25,7 @@

              * `chmod 640 ~/.ssh/authorized_keys`

             3. Logout of remote system, and repeat login to check that everything works correctly. If so, `~/id_rsa.pub` can be removed from the remote system.

          -###For Systems on the SBGrid network in Longwood Medical area

          +### For Systems on the SBGrid network in Longwood Medical area

           The 'pub' key ***must*** be uploaded to our authentication servers. These examples assume you copied the pub key to your Linux home directory, you can also copy and paste the entire contents of the .pub file between systems.

           You will need to run these commands on **xtal200.harvard.edu**. If you are a Consortium member use shell.sbgrid.org.

				faq-using-your-crystal-harvard-edu-email-address.md
			
          @@ -36,5 +36,9 @@ To configure your address in a client such as Apple's Mail Application or Thunde

           ## 2 Factor Authentication

           * The easiest way to turn on 2fa for your account is to click here: [myaccount.google.com](https://myaccount.google.com/signinoptions/two-step-verification/enroll-welcome).

          +<<<<<<< HEAD

           * For further information see the Google provided [documentation](https://www.google.com/landing/2step/#tab=why-you-need-it).

          +=======

          +* For more information see the Google provided [documentation](https://www.google.com/landing/2step/#tab=why-you-need-it).

          +>>>>>>> b43cc1b889ca876ebb51c240635740a52fde4e6f

           * The steps from your gmail web interface are as follows: Click on the SBGrid icon in the upper left - Select 'Manage your Google Account' - On the left select 'Security' - in the middle select '2-Step Verification' and then complete the web forms.

...	...	@@ -25,7 +25,7 @@
25	25	* `chmod 640 ~/.ssh/authorized_keys`
26	26	3. Logout of remote system, and repeat login to check that everything works correctly. If so, `~/id_rsa.pub` can be removed from the remote system.
27	27
28		-###For Systems on the SBGrid network in Longwood Medical area
	28	+### For Systems on the SBGrid network in Longwood Medical area
29	29	The 'pub' key *must* be uploaded to our authentication servers. These examples assume you copied the pub key to your Linux home directory, you can also copy and paste the entire contents of the .pub file between systems.
30	30
31	31	You will need to run these commands on xtal200.harvard.edu. If you are a Consortium member use shell.sbgrid.org.

...	...	@@ -36,5 +36,9 @@ To configure your address in a client such as Apple's Mail Application or Thunde
36	36	## 2 Factor Authentication
37	37
38	38	* The easiest way to turn on 2fa for your account is to click here: [myaccount.google.com](https://myaccount.google.com/signinoptions/two-step-verification/enroll-welcome).
	39	+<<<<<<< HEAD
39	40	* For further information see the Google provided [documentation](https://www.google.com/landing/2step/#tab=why-you-need-it).
	41	+=======
	42	+* For more information see the Google provided [documentation](https://www.google.com/landing/2step/#tab=why-you-need-it).
	43	+>>>>>>> b43cc1b889ca876ebb51c240635740a52fde4e6f
40	44	* The steps from your gmail web interface are as follows: Click on the SBGrid icon in the upper left - Select 'Manage your Google Account' - On the left select 'Security' - in the middle select '2-Step Verification' and then complete the web forms.