Revert "Instructions for returning student (#315)" (#316)

This reverts commit 905a688.

Author: julesvanrie

LINUX.md

@@ -354,13 +354,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash
@@ -412,13 +405,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash

VM.md

@@ -778,13 +778,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash
@@ -836,13 +829,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash

WINDOWS.md

@@ -906,13 +906,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash
@@ -964,13 +957,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash

_partials/dotfiles_new_laptop.md

@@ -15,13 +15,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash

macOS.md

@@ -404,13 +404,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash
@@ -462,13 +455,6 @@ mkdir -p ~/code/$GITHUB_USERNAME && cd $_
 gh repo fork lewagon/dotfiles --clone
 ```
 
-Now, your dotfiles might not be in sync anymore with the Le Wagon version. **Ask a TA** to run through these steps together:
-
-1. `git merge upstream/master`
-2. Check that you're not in MERGING state (if any conflicts resolve them)
-3. Do a `git diff HEAD~1 HEAD` to check what changed
-4. If nothing seems out of the ordinary, continue
-
 Run the `dotfiles` installer.
 
 ```bash