From 66f4334f232db4a6ed1f8312163d5bbb63d3f3cf Mon Sep 17 00:00:00 2001
From: James Blair <mail@jamesblair.net>
Date: Sat, 1 Feb 2020 13:24:00 +1300
Subject: [PATCH] Corrected file layout.

---
 wsl-setup.org | 2 --
 1 file changed, 2 deletions(-)

diff --git a/wsl-setup.org b/wsl-setup.org
index 03b26e3..d7e24f1 100644
--- a/wsl-setup.org
+++ b/wsl-setup.org
@@ -46,9 +46,7 @@ This guide will walk through setting up [[https://en.wikipedia.org/wiki/Windows_
    #+NAME: Install standard packages 
    #+BEGIN_SRC shell
    # Install basic utilities
-<<<<<<< HEAD
     sudo apt-get install -y git locales curl wget xclip xsel tmux tmate net-tools less wget htop screenfetch zip openssh-client dictd
->>>>>>> 699d2ef8481b18b7c41c00f62e1bbff84fefadd7
   
    # Install pre-requisites for compiling emacs
    sudo apt-get install -y make gcc libgnutls28-dev libtinfo-dev