From aed489086cfbb6033b025994d07f4b3ff172774a Mon Sep 17 00:00:00 2001
From: Shreyas Minocha <11537232+shreyasminocha@users.noreply.github.com>
Date: Thu, 30 Jul 2020 08:33:59 +0000
Subject: [PATCH] Remove conflict artifacts

---
 Usage.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Usage.md b/Usage.md
index 0633785..06a73a6 100644
--- a/Usage.md
+++ b/Usage.md
@@ -70,7 +70,6 @@ If you're using Docker, also make sure to read the Configuration section on the
 ### Import a single URL
 
 ```bash
-<<<<<<< HEAD
 archivebox add 'https://example.com'
 # or
 echo 'https://example.com' | archivebox add