From d15767f03ce887969914c5b76d19347e70a60874 Mon Sep 17 00:00:00 2001
From: Thomas Dehaeze <dehaeze.thomas@gmail.com>
Date: Sat, 20 Jul 2019 17:46:08 +0200
Subject: [PATCH] Removed typo

---
 dotfiles/binaries.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dotfiles/binaries.org b/dotfiles/binaries.org
index 4f0b5f9..25fda0e 100644
--- a/dotfiles/binaries.org
+++ b/dotfiles/binaries.org
@@ -666,7 +666,6 @@ The sed piece just removes the colon from the provided prompt: =rofi -p= already
   fi
 #+end_src
 
-<<<<<<< Updated upstream
 * Mount TMP14DAYS
   :PROPERTIES:
   :header-args: :tangle ~/bin/mnt_tmp_14_days